pim/nixos-configs
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Update to NixOS 24.11

Browse source
This commit is contained in:
Pim Kunis 2024-11-30 13:14:46 +01:00
parent c0a75e8e0e
commit a90c75931b
12 changed files with 140 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
flake.lock
View file

@ -53,11 +53,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696727917, "lastModified": 1720809814,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,15 +101,15 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1663659192, "lastModified": 1716150083,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"type": "github" "type": "github"
} }
@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732284644, "lastModified": 1732919362,
"narHash": "sha256-REGLarOB5McRMmFtOgNihEXXQILY6+2UBAY8lw8CJCI=", "narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "abc8baff333ac9dca930fc4921a26a8fc248e442", "rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,6 +288,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -394,16 +415,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1732466619,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "f3111f62a23451114433888902a55cf0692b408d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -416,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714981474, "lastModified": 1724435763,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732461762, "lastModified": 1732519917,
"narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=", "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "bedc30c64442579943c1c6e7579db263d810884f", "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +523,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1732412226, "lastModified": 1732757557,
"narHash": "sha256-Eb7LqtaCVgZy5Kp3pMrRTAmcnFO7HGj6lpAM2TrQzTA=", "narHash": "sha256-zADldaLfiSb2iGPhcSJPokGypYa1Fix0llhWkMvm8pQ=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "44c9057ebbf4eb41cff08b8fc9c952b3f977656a", "rev": "5116835b8eb2ec18ec258050a11d374d38ac8764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +553,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732521221,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -580,11 +601,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732238832, "lastModified": 1732812356,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -596,27 +617,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731797254, "lastModified": 1732824227,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1714912032, "lastModified": 1725194671,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -644,11 +665,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1732461014, "lastModified": 1732965400,
"narHash": "sha256-4KMZSCldwLImqrGxj8o5VpW5ej0L+EmxrlJzG2na8t4=", "narHash": "sha256-sd70kImYBHhPm2carweV0MjkswAcDaH4f0n6lFvde9A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5951bcd835d728eb0db62425dba44a79d83c75d0", "rev": "5564914011ac9ef3309b94aabc40ae0502e64206",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +761,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732328983, "lastModified": 1732588352,
"narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -760,11 +781,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732186149, "lastModified": 1732575825,
"narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,21 +804,23 @@
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3",
"systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1726776484, "lastModified": 1726497442,
"narHash": "sha256-SPnk08RnllF8CD9Ndbe828Z1OmlviJ+ZJLsiT7V/+4A=", "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=",
"owner": "pizzapim", "owner": "pizzapim",
"repo": "stylix", "repo": "stylix",
"rev": "d444b97c5e691a2a468000c939119798e42b4f0f", "rev": "149b313ddf91c3cc94309170498b162cec666675",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "pizzapim", "owner": "pizzapim",
"ref": "release-24.05", "ref": "master",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@ -832,16 +855,31 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1732292307, "lastModified": 1732894027,
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "705df92694af7093dfbb27109ce16d828a79155f", "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -2,10 +2,10 @@
description = "My NixOS configuration"; description = "My NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
stylix.url = "github:pizzapim/stylix/release-24.05"; stylix.url = "github:pizzapim/stylix/master";
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
@ -21,7 +21,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager?ref=release-24.05"; url = "github:nix-community/home-manager?ref=release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
home-manager/default.nix
View file

@ -107,7 +107,7 @@
alacritty = { alacritty = {
enable = true; enable = true;
settings.shell = { settings.terminal.shell = {
program = lib.getExe config.programs.tmux.package; program = lib.getExe config.programs.tmux.package;
args = ["attach"]; args = ["attach"];
}; };

2
home-manager/gnome.nix
View file

@ -10,7 +10,7 @@ in {
options.pim.gnome.enable = lib.mkEnableOption "gnome"; options.pim.gnome.enable = lib.mkEnableOption "gnome";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [gnome.gnome-tweaks]; home.packages = [pkgs.gnome-tweaks];
dconf.settings = with lib.hm.gvariant; { dconf.settings = with lib.hm.gvariant; {
"org/gnome/desktop/sound".allow-volume-above-100-percent = true; "org/gnome/desktop/sound".allow-volume-above-100-percent = true;

2
home-manager/neovim/default.nix
View file

@ -19,7 +19,7 @@ in {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
nil nil
nodePackages.pyright pyright
gopls gopls
terraform-ls terraform-ls
nixfmt-classic nixfmt-classic

6
machines/gamepc/configuration.nix
View file

@ -16,6 +16,7 @@
networking.hostName = "gamepc"; networking.hostName = "gamepc";
home-manager.users.pim.imports = [./pim.home.nix]; home-manager.users.pim.imports = [./pim.home.nix];
programs.steam.enable = true; programs.steam.enable = true;
system.stateVersion = "24.05";
users.users = { users.users = {
root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim; root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim;
@ -32,10 +33,7 @@
tags = ["desktop"]; tags = ["desktop"];
}; };
services = { services.openssh.enable = true;
openssh.enable = true;
tailscale.enable = true;
};
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;

2
machines/sue/configuration.nix
View file

@ -28,11 +28,11 @@
tags = ["desktop"]; tags = ["desktop"];
}; };
services.tailscale.enable = true;
facter.reportPath = ./facter.json; facter.reportPath = ./facter.json;
home-manager.users.pim.imports = [./pim.home.nix]; home-manager.users.pim.imports = [./pim.home.nix];
networking.hostName = "sue"; networking.hostName = "sue";
nix.settings.trusted-users = ["pim"]; nix.settings.trusted-users = ["pim"];
system.stateVersion = "23.05";
sops = { sops = {
age.keyFile = "/root/.config/sops/age/keys.txt"; age.keyFile = "/root/.config/sops/age/keys.txt";

1
machines/sue/pim.home.nix
View file

@ -57,6 +57,7 @@
# nheko # Has insecure olm dependency # nheko # Has insecure olm dependency
handbrake handbrake
feishin feishin
redfishtool
]); ]);
}; };
} }

4
nixos/cinnamon.nix
View file

@ -17,8 +17,8 @@ in {
}; };
}; };
environment.cinnamon.excludePackages = with pkgs; [ environment.cinnamon.excludePackages = [
gnome.gnome-terminal pkgs.gnome-terminal
]; ];
}; };
} }

18
nixos/default.nix
View file

@ -62,6 +62,7 @@
services = { services = {
xserver.excludePackages = [pkgs.xterm]; xserver.excludePackages = [pkgs.xterm];
printing.drivers = [pkgs.hplip pkgs.gutenprint]; printing.drivers = [pkgs.hplip pkgs.gutenprint];
tailscale.enable = true;
pipewire = { pipewire = {
alsa.enable = true; alsa.enable = true;
@ -96,15 +97,11 @@
]; ];
}; };
system = { system.activationScripts.diff = ''
stateVersion = "23.05"; if [[ -e /run/current-system ]]; then
${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
activationScripts.diff = '' fi
if [[ -e /run/current-system ]]; then '';
${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
fi
'';
};
security = { security = {
rtkit.enable = true; rtkit.enable = true;
@ -115,7 +112,7 @@
}; };
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixVersions.stable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
@ -147,6 +144,7 @@
"steam" "steam"
"steam-original" "steam-original"
"steam-run" "steam-run"
"steam-unwrapped"
]; ];
}; };

41
nixos/gnome.nix
View file

@ -21,7 +21,7 @@ in {
environment = { environment = {
systemPackages = systemPackages =
[ [
pkgs.gnome.gnome-shell-extensions pkgs.gnome-shell-extensions
] ]
++ (with pkgs.gnomeExtensions; [ ++ (with pkgs.gnomeExtensions; [
pop-shell pop-shell
@ -31,27 +31,24 @@ in {
]) ])
++ lib.optional config.services.tailscale.enable pkgs.gnomeExtensions.tailscale-status; ++ lib.optional config.services.tailscale.enable pkgs.gnomeExtensions.tailscale-status;
gnome.excludePackages = gnome.excludePackages = with pkgs; [
(with pkgs; [ epiphany
epiphany gnome-connections
gnome-connections gnome-console
gnome-console gnome-tour
gnome-tour geary
]) gnome-calendar
++ (with pkgs.gnome; [ gnome-clocks
geary gnome-contacts
gnome-calendar gnome-font-viewer
gnome-clocks gnome-logs
gnome-contacts gnome-maps
gnome-font-viewer gnome-music
gnome-logs seahorse
gnome-maps totem
gnome-music yelp
seahorse gnome-weather
totem ];
yelp
gnome-weather
]);
}; };
}; };
} }

9
nixos/server.nix Normal file
View file

@ -0,0 +1,9 @@
{
lib,
config,
...
}: {
config = lib.mkIf (builtins.elem "server" config.deployment.tags) {
services.openssh.enable = true;
};
}