diff --git a/flake.lock b/flake.lock index e995868..c598a23 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -101,15 +101,15 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1732284644, - "narHash": "sha256-REGLarOB5McRMmFtOgNihEXXQILY6+2UBAY8lw8CJCI=", + "lastModified": 1732919362, + "narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=", "owner": "nix-community", "repo": "disko", - "rev": "abc8baff333ac9dca930fc4921a26a8fc248e442", + "rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4", "type": "github" }, "original": { @@ -288,6 +288,27 @@ "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": { "flake": false, "locked": { @@ -394,16 +415,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -416,11 +437,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -463,11 +484,11 @@ ] }, "locked": { - "lastModified": 1732461762, - "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bedc30c64442579943c1c6e7579db263d810884f", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -502,11 +523,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732412226, - "narHash": "sha256-Eb7LqtaCVgZy5Kp3pMrRTAmcnFO7HGj6lpAM2TrQzTA=", + "lastModified": 1732757557, + "narHash": "sha256-zADldaLfiSb2iGPhcSJPokGypYa1Fix0llhWkMvm8pQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "44c9057ebbf4eb41cff08b8fc9c952b3f977656a", + "rev": "5116835b8eb2ec18ec258050a11d374d38ac8764", "type": "github" }, "original": { @@ -532,11 +553,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -580,11 +601,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "lastModified": 1732812356, + "narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe", "type": "github" }, "original": { @@ -596,27 +617,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1714912032, - "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -644,11 +665,11 @@ }, "nur": { "locked": { - "lastModified": 1732461014, - "narHash": "sha256-4KMZSCldwLImqrGxj8o5VpW5ej0L+EmxrlJzG2na8t4=", + "lastModified": 1732965400, + "narHash": "sha256-sd70kImYBHhPm2carweV0MjkswAcDaH4f0n6lFvde9A=", "owner": "nix-community", "repo": "NUR", - "rev": "5951bcd835d728eb0db62425dba44a79d83c75d0", + "rev": "5564914011ac9ef3309b94aabc40ae0502e64206", "type": "github" }, "original": { @@ -740,11 +761,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1732588352, + "narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb", "type": "github" }, "original": { @@ -760,11 +781,11 @@ ] }, "locked": { - "lastModified": 1732186149, - "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "type": "github" }, "original": { @@ -783,21 +804,23 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_3" }, "locked": { - "lastModified": 1726776484, - "narHash": "sha256-SPnk08RnllF8CD9Ndbe828Z1OmlviJ+ZJLsiT7V/+4A=", + "lastModified": 1726497442, + "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=", "owner": "pizzapim", "repo": "stylix", - "rev": "d444b97c5e691a2a468000c939119798e42b4f0f", + "rev": "149b313ddf91c3cc94309170498b162cec666675", "type": "github" }, "original": { "owner": "pizzapim", - "ref": "release-24.05", + "ref": "master", "repo": "stylix", "type": "github" } @@ -832,16 +855,31 @@ "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": { "inputs": { "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b1b068b..d29855a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "My NixOS configuration"; 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"; 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"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; flake-utils.url = "github:numtide/flake-utils"; @@ -21,7 +21,7 @@ }; 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"; }; diff --git a/home-manager/default.nix b/home-manager/default.nix index cce73d0..bed0347 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -107,7 +107,7 @@ alacritty = { enable = true; - settings.shell = { + settings.terminal.shell = { program = lib.getExe config.programs.tmux.package; args = ["attach"]; }; diff --git a/home-manager/gnome.nix b/home-manager/gnome.nix index ce22d6a..386d667 100644 --- a/home-manager/gnome.nix +++ b/home-manager/gnome.nix @@ -10,7 +10,7 @@ in { options.pim.gnome.enable = lib.mkEnableOption "gnome"; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [gnome.gnome-tweaks]; + home.packages = [pkgs.gnome-tweaks]; dconf.settings = with lib.hm.gvariant; { "org/gnome/desktop/sound".allow-volume-above-100-percent = true; diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index 77672cd..3cb10af 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -19,7 +19,7 @@ in { extraPackages = with pkgs; [ nil - nodePackages.pyright + pyright gopls terraform-ls nixfmt-classic diff --git a/machines/gamepc/configuration.nix b/machines/gamepc/configuration.nix index c34b262..dba7c99 100644 --- a/machines/gamepc/configuration.nix +++ b/machines/gamepc/configuration.nix @@ -16,6 +16,7 @@ networking.hostName = "gamepc"; home-manager.users.pim.imports = [./pim.home.nix]; programs.steam.enable = true; + system.stateVersion = "24.05"; users.users = { root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim; @@ -32,10 +33,7 @@ tags = ["desktop"]; }; - services = { - openssh.enable = true; - tailscale.enable = true; - }; + services.openssh.enable = true; boot.loader.grub = { enable = true; diff --git a/machines/sue/configuration.nix b/machines/sue/configuration.nix index 888160a..79a422f 100644 --- a/machines/sue/configuration.nix +++ b/machines/sue/configuration.nix @@ -28,11 +28,11 @@ tags = ["desktop"]; }; - services.tailscale.enable = true; facter.reportPath = ./facter.json; home-manager.users.pim.imports = [./pim.home.nix]; networking.hostName = "sue"; nix.settings.trusted-users = ["pim"]; + system.stateVersion = "23.05"; sops = { age.keyFile = "/root/.config/sops/age/keys.txt"; diff --git a/machines/sue/pim.home.nix b/machines/sue/pim.home.nix index 966edf4..3663294 100644 --- a/machines/sue/pim.home.nix +++ b/machines/sue/pim.home.nix @@ -57,6 +57,7 @@ # nheko # Has insecure olm dependency handbrake feishin + redfishtool ]); }; } diff --git a/nixos/cinnamon.nix b/nixos/cinnamon.nix index 85178de..8cef6dd 100644 --- a/nixos/cinnamon.nix +++ b/nixos/cinnamon.nix @@ -17,8 +17,8 @@ in { }; }; - environment.cinnamon.excludePackages = with pkgs; [ - gnome.gnome-terminal + environment.cinnamon.excludePackages = [ + pkgs.gnome-terminal ]; }; } diff --git a/nixos/default.nix b/nixos/default.nix index 07543c5..9a106f5 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -62,6 +62,7 @@ services = { xserver.excludePackages = [pkgs.xterm]; printing.drivers = [pkgs.hplip pkgs.gutenprint]; + tailscale.enable = true; pipewire = { alsa.enable = true; @@ -96,15 +97,11 @@ ]; }; - system = { - stateVersion = "23.05"; - - activationScripts.diff = '' - if [[ -e /run/current-system ]]; then - ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig" - fi - ''; - }; + system.activationScripts.diff = '' + if [[ -e /run/current-system ]]; then + ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig" + fi + ''; security = { rtkit.enable = true; @@ -115,7 +112,7 @@ }; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes @@ -147,6 +144,7 @@ "steam" "steam-original" "steam-run" + "steam-unwrapped" ]; }; diff --git a/nixos/gnome.nix b/nixos/gnome.nix index 72ed9a5..45864a1 100644 --- a/nixos/gnome.nix +++ b/nixos/gnome.nix @@ -21,7 +21,7 @@ in { environment = { systemPackages = [ - pkgs.gnome.gnome-shell-extensions + pkgs.gnome-shell-extensions ] ++ (with pkgs.gnomeExtensions; [ pop-shell @@ -31,27 +31,24 @@ in { ]) ++ lib.optional config.services.tailscale.enable pkgs.gnomeExtensions.tailscale-status; - gnome.excludePackages = - (with pkgs; [ - epiphany - gnome-connections - gnome-console - gnome-tour - ]) - ++ (with pkgs.gnome; [ - geary - gnome-calendar - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - seahorse - totem - yelp - gnome-weather - ]); + gnome.excludePackages = with pkgs; [ + epiphany + gnome-connections + gnome-console + gnome-tour + geary + gnome-calendar + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + seahorse + totem + yelp + gnome-weather + ]; }; }; } diff --git a/nixos/server.nix b/nixos/server.nix new file mode 100644 index 0000000..28ec4d5 --- /dev/null +++ b/nixos/server.nix @@ -0,0 +1,9 @@ +{ + lib, + config, + ... +}: { + config = lib.mkIf (builtins.elem "server" config.deployment.tags) { + services.openssh.enable = true; + }; +}