tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

zenix: use nheko, move cosmic stuff

Browse source
This commit is contained in:
tristan 2024-07-25 20:00:22 +01:00
parent 8e5db18741
commit c36d393ed5
8 changed files with 32 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

34
flake.lock generated
View file

@ -228,11 +228,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1720402578, "lastModified": 1720834574,
"narHash": "sha256-Zw+4iAKfIaSu0x8HZeQzC8r8Gktz8+HdZSdVdZ8buqs=", "narHash": "sha256-VBJLs1yX4CsG3mr5nPjm6Z7NBStyJlGRNdmr2IoWU70=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "bbd44e1198e9a998af04b6973d3f3a2c9950ae46", "rev": "733919b05babc978b0c015987a6c4de499ff27cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720031269, "lastModified": 1720542800,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720244366, "lastModified": 1720691131,
"narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,7 +342,6 @@
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable-nixpkgs": "stable-nixpkgs",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
@ -365,21 +364,6 @@
"type": "github" "type": "github"
} }
}, },
"stable-nixpkgs": {
"locked": {
"lastModified": 1719957072,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",

10
flake.nix
View file

@ -3,14 +3,15 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
stable-nixpkgs.url = "nixpkgs/nixos-23.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
};
}; };
outputs = inputs: let outputs = inputs: let
@ -93,10 +94,7 @@
[ [
./hardware/vm.nix ./hardware/vm.nix
./nixos/workstation.nix ./nixos/workstation.nix
{ ./nixos/programs/cosmic.nix
services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;
}
] [ ] [
./home/workstation.nix ./home/workstation.nix
]; ];

2
hardware/vm.nix
View file

@ -1,7 +1,7 @@
{config, ...}: let {config, ...}: let
user = config.user; user = config.user;
in { in {
hardware.opengl.enable = true; hardware.graphics.enable = true;
boot.kernelModules = ["kvm-amd" "qxl" "bochs_drm"]; boot.kernelModules = ["kvm-amd" "qxl" "bochs_drm"];
system.stateVersion = "24.05"; system.stateVersion = "24.05";

2
home/default.nix
View file

@ -35,7 +35,7 @@
libsixel libsixel
yt-dlp yt-dlp
ytfzf ytfzf
neofetch fastfetch
tree tree
ansible ansible
]; ];

2
home/programs/graphical.nix
View file

@ -32,7 +32,7 @@
shortwave shortwave
# other # other
element-desktop nheko
brave brave
vieb vieb
bitwarden bitwarden

2
home/workstation.nix
View file

@ -34,7 +34,7 @@
notify = true; notify = true;
}; };
programs.rbw.settings.pinentry = pkgs.pinentry-qt; programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ"; home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = '' home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''

11
nixos/programs/cosmic.nix Normal file
View file

@ -0,0 +1,11 @@
{inputs, ...}: {
imports = [
inputs.nixos-cosmic.nixosModules.default
];
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;
}

10
nixos/workstation.nix
View file

@ -6,16 +6,11 @@
}: { }: {
imports = [ imports = [
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
inputs.nixos-cosmic.nixosModules.default
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-27.3.11" "electron-27.3.11"
]; ];
programs.hyprland = {
enable = true;
};
# use pipewire # use pipewire
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
@ -53,7 +48,10 @@
services.printing.enable = true; services.printing.enable = true;
services.dbus.enable = true; services.dbus = {
enable = true;
packages = [pkgs.gcr];
};
programs.light.enable = true; programs.light.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;