From b95ed726eb155c6a3d07de629ca356c7f22c5919 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 1 Dec 2022 21:14:53 +0100 Subject: [PATCH] update to nixos-22.11 --- flake.lock | 145 +++++++++++++++------------------- flake.nix | 26 +++--- machines/headless.nix | 2 - profiles/games/default.nix | 2 +- profiles/xsession/default.nix | 1 - 5 files changed, 82 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index ab806e9..30052bf 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "all-cabal-json": { - "flake": false, - "locked": { - "lastModified": 1665552503, - "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", - "owner": "nix-community", - "repo": "all-cabal-json", - "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "hackage", - "repo": "all-cabal-json", - "type": "github" - } - }, "crane": { "flake": false, "locked": { @@ -42,7 +25,7 @@ "locked": { "lastModified": 1656687988, "narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=", - "ref": "master", + "ref": "refs/heads/master", "rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03", "revCount": 160, "type": "git", @@ -73,10 +56,12 @@ "inputs": { "alejandra": [ "helix", - "nci", - "nixpkgs" + "nci" + ], + "all-cabal-json": [ + "helix", + "nci" ], - "all-cabal-json": "all-cabal-json", "crane": "crane", "devshell": [ "helix", @@ -85,19 +70,19 @@ ], "flake-utils-pre-commit": [ "helix", - "nci", - "nixpkgs" + "nci" + ], + "ghc-utils": [ + "helix", + "nci" ], - "ghc-utils": "ghc-utils", "gomod2nix": [ "helix", - "nci", - "nixpkgs" + "nci" ], "mach-nix": [ "helix", - "nci", - "nixpkgs" + "nci" ], "nixpkgs": [ "helix", @@ -106,21 +91,19 @@ ], "poetry2nix": [ "helix", - "nci", - "nixpkgs" + "nci" ], "pre-commit-hooks": [ "helix", - "nci", - "nixpkgs" + "nci" ] }, "locked": { - "lastModified": 1667429039, - "narHash": "sha256-Lu6da25JioHzerkLHAHSO9suCQFzJ/XBjkcGCIbasLM=", + "lastModified": 1668851003, + "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=", "owner": "nix-community", "repo": "dream2nix", - "rev": "5252794e58eedb02d607fa3187ffead7becc81b0", + "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628", "type": "github" }, "original": { @@ -159,22 +142,6 @@ "type": "github" } }, - "ghc-utils": { - "flake": false, - "locked": { - "lastModified": 1662774800, - "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=", - "ref": "refs/heads/master", - "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea", - "revCount": 1072, - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - }, - "original": { - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - } - }, "helix": { "inputs": { "nci": "nci", @@ -184,11 +151,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1668522840, - "narHash": "sha256-lM2yg9+wDwBupmtgkARd3yx3Q6viDdbPIeTstL+CyFs=", + "lastModified": 1669912658, + "narHash": "sha256-U2nF7FyRFD59zHfy+3IaiPmFu7MdgyA5TYDBbUikoA4=", "owner": "helix-editor", "repo": "helix", - "rev": "df6d04425d130f385c4314ed944d5a27963ae9a3", + "rev": "a8a54be6bcd0667c50b7c739dbfd072df684b3c3", "type": "github" }, "original": { @@ -197,23 +164,24 @@ "type": "github" } }, - "home-manager-2205": { + "home-manager": { "inputs": { "nixpkgs": [ - "nixos-2205" - ] + "nixpkgs" + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1669724862, + "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -232,11 +200,11 @@ ] }, "locked": { - "lastModified": 1667542401, - "narHash": "sha256-mdWjP5tjSf8n6FAtpSgL23kX4+eWBwLrSYo9iY3mA8Q=", + "lastModified": 1669011203, + "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "cd5e5cbd81c80dc219455dd3b1e0ddb55fae51ec", + "rev": "c5133b91fc1d549087c91228bd213f2518728a4b", "type": "github" }, "original": { @@ -249,7 +217,7 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixos-2205" + "nixpkgs" ] }, "locked": { @@ -266,29 +234,29 @@ "type": "github" } }, - "nixos-2205": { + "nixpkgs": { "locked": { - "lastModified": 1668459637, - "narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1668524723, - "narHash": "sha256-JIJ0MtvY23I/6aIsqi8CG67XWZ/34WtDcgFXxgSTvNU=", + "lastModified": 1669805596, + "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=", "owner": "nix-community", "repo": "NUR", - "rev": "8e8775f99549ba721c11643dfe70f4161d5c2f0b", + "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007", "type": "github" }, "original": { @@ -301,9 +269,9 @@ "inputs": { "dan": "dan", "helix": "helix", - "home-manager-2205": "home-manager-2205", + "home-manager": "home-manager", "nixgl": "nixgl", - "nixos-2205": "nixos-2205", + "nixpkgs": "nixpkgs", "nur": "nur", "unstable": "unstable" } @@ -317,11 +285,11 @@ ] }, "locked": { - "lastModified": 1667487142, - "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=", + "lastModified": 1668998422, + "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b", + "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e", "type": "github" }, "original": { @@ -332,11 +300,11 @@ }, "unstable": { "locked": { - "lastModified": 1668475027, - "narHash": "sha256-1xDT1pAm+NpH6cnjoC4v+xWGoGimiWZnth2bX899RKA=", + "lastModified": 1669867399, + "narHash": "sha256-Z8RXSFYOsIsTG96ROKtV0eZ8Q7u4irFWm6ELqfw7mT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "032b5c19b09e8bb9b80eba484b58d1b525dc609d", + "rev": "38e591dd05ffc8bdf79dc752ba78b05e370416fa", "type": "github" }, "original": { @@ -345,6 +313,21 @@ "repo": "nixpkgs", "type": "github" } + }, + "utils": { + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 18de13a..36bb176 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,14 @@ nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; inputs = { - home-manager-2205.url = "github:nix-community/home-manager/release-22.05"; - nixos-2205.url = "github:nixos/nixpkgs/nixos-22.05"; - home-manager-2205.inputs.nixpkgs.follows = "nixos-2205"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + + home-manager.url = "github:nix-community/home-manager/release-22.11"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nur.url = "github:nix-community/NUR"; - nur.inputs.nixpkgs.follows = "unstable"; dan.url = "git+https://git2.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR"; dan.inputs.nixpkgs.follows = "unstable"; @@ -21,16 +21,15 @@ helix.inputs.nixpkgs.follows = "unstable"; nixgl.url = "github:guibou/nixGL"; - nixgl.inputs.nixpkgs.follows = "nixos-2205"; + nixgl.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = {self, home-manager-2205, unstable, nur, dan, nixgl, ... }@inputs: + outputs = {self, nixpkgs, home-manager, unstable, nur, dan, nixgl, ... }@inputs: let nixlib = unstable.lib; mkHome = { machine - , hmChannel ? home-manager-2205 , configuration ? self.nixosModules.home-manager.${machine} , system ? "x86_64-linux" , username ? "daniel" @@ -38,8 +37,17 @@ , stateVersion ? "22.05" , extraSpecialArgs ? { inherit (self) overlays; } }: - hmChannel.lib.homeManagerConfiguration { - inherit configuration system username homeDirectory stateVersion extraSpecialArgs; + home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ + configuration + { + home = { + inherit username homeDirectory stateVersion; + }; + } + ]; + inherit extraSpecialArgs; }; mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs)); diff --git a/machines/headless.nix b/machines/headless.nix index 33c242d..c7bb4f9 100644 --- a/machines/headless.nix +++ b/machines/headless.nix @@ -12,7 +12,5 @@ }; profiles.base.enable = true; - profiles.base.enable = false; - profiles.zsh.enable = true; } diff --git a/profiles/games/default.nix b/profiles/games/default.nix index 6291531..713e97d 100644 --- a/profiles/games/default.nix +++ b/profiles/games/default.nix @@ -18,7 +18,7 @@ in { ] ++ lib.optionals config.profiles.gui.enable [ steam - unstable.polymc + unstable.prismlauncher # minetest # dwarf-fortress-packages.dwarf-fortress-full # superTuxKart diff --git a/profiles/xsession/default.nix b/profiles/xsession/default.nix index 41b2cc7..3c6a933 100644 --- a/profiles/xsession/default.nix +++ b/profiles/xsession/default.nix @@ -97,7 +97,6 @@ in services.picom = { enable = true; backend = "xrender"; - experimentalBackends = true; };