diff --git a/flake.lock b/flake.lock index 83b8ea9..9d117ad 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1669149307, - "narHash": "sha256-mOKsVWY9l1aC4BCQAiPsSqT4Gs8mTwfHCgwmTDLDSHs=", + "lastModified": 1669251968, + "narHash": "sha256-RNEbDDGHEBCQR3FXnO/t9Tb24hzqwj7I9Q4U8r9hTtg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "89f2e82fec9f7c2dde0381976266a245f0072217", + "rev": "d381dcca8193bce5c65aca58832b53b79e31d167", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1669147105, - "narHash": "sha256-PNVfezdB7tBiwt5+aucsPjztMGhjyjSE/2OcCwbL8q8=", + "lastModified": 1669184726, + "narHash": "sha256-YF3xLbY3eJ3d4x3fkh8pASeJ4Y7P2vTg8spdRKLDnM8=", "owner": "nix-community", "repo": "fenix", - "rev": "5d23c44d776ed1c28b08bd6aa5f4a392e9ae0f2d", + "rev": "72b820427fbd59a55368cda4de159134764e3ff6", "type": "github" }, "original": { @@ -232,19 +232,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils_2" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1669071065, + "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "f7641a3ff398ccce952e19a199d775934e518c1d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -292,7 +293,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils_3" }, "locked": { "lastModified": 1656122108, @@ -314,7 +315,7 @@ "quilt-server", "nixpkgs" ], - "utils": "utils_3" + "utils": "utils_4" }, "locked": { "lastModified": 1656122108, @@ -448,16 +449,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668984258, - "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", + "lastModified": 1669196922, + "narHash": "sha256-J1fjyUsst3mXxgz2Z1cD7boh1Q5GmfeZjNfW1WVMsr8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", + "rev": "e8016a90db25c48cfe2cb8ab48bbc94a4365dab9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -496,11 +497,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1669052418, - "narHash": "sha256-M1I4BKXBQm2gey1tScemEh5TpHHE3gKptL7BpWUvL8s=", + "lastModified": 1669140675, + "narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20fc948445a6c22d4e8d5178e9a6bc6e1f5417c8", + "rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c", "type": "github" }, "original": { @@ -600,11 +601,11 @@ "tomlplusplus": "tomlplusplus" }, "locked": { - "lastModified": 1669067083, - "narHash": "sha256-WC1GXEosjPoI2mEuMf2QDlLO+l3Vhg6Vod4DpJPWN48=", + "lastModified": 1669245105, + "narHash": "sha256-D4Xmo05kVrZENaFtQgIMY5d+xMxi6chIIgDzEec4meE=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "68b7aa0a4d124b231ba351ae8d37ea6c55b333a2", + "rev": "b60fe08d44fbf70bff1555ab0e0cee0a00172ac8", "type": "github" }, "original": { @@ -767,6 +768,21 @@ } }, "utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -781,7 +797,7 @@ "type": "github" } }, - "utils_3": { + "utils_4": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", diff --git a/flake.nix b/flake.nix index 3cf9d0e..707bbc4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "Nathan's system configurations"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { @@ -129,7 +129,6 @@ # Real systems nixosConfigurations = { levitation = makeNixosSystem { - ourNixpkgs = nixpkgs-unstable; system = "x86_64-linux"; hostName = "levitation"; extraModules = [ diff --git a/modules/linux/linux/base.nix b/modules/linux/linux/base.nix index aba028f..3ce2bed 100644 --- a/modules/linux/linux/base.nix +++ b/modules/linux/linux/base.nix @@ -7,7 +7,9 @@ with lib; { algorithm = "lz4"; memoryPercent = 25; }; - nix = mkIf config.nathan.config.nix.autoGC { autoOptimiseStore = true; }; + nix = mkIf config.nathan.config.nix.autoGC { + settings.auto-optimise-store = true; + }; }) (mkIf config.nathan.config.harden (import "${inputs.nixpkgs}/nixos/modules/profiles/hardened.nix" attrs)) diff --git a/modules/linux/swaywm.nix b/modules/linux/swaywm.nix index a937e21..bd78d53 100644 --- a/modules/linux/swaywm.nix +++ b/modules/linux/swaywm.nix @@ -68,7 +68,6 @@ in with lib; { xdg-desktop-portal-wlr xdg-desktop-portal-gtk ]; - gtkUsePortal = true; }; };