diff --git a/flake.lock b/flake.lock index 5026608a..ad9640ee 100644 --- a/flake.lock +++ b/flake.lock @@ -5,7 +5,7 @@ "darwin": "darwin", "home-manager": "home-manager", "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ] }, "locked": { @@ -26,7 +26,7 @@ "inputs": { "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ] }, "locked": { @@ -89,7 +89,7 @@ "disko": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ] }, "locked": { @@ -110,7 +110,7 @@ "inputs": { "nix-formatter-pack": "nix-formatter-pack_2", "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ] }, "locked": { @@ -246,7 +246,7 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ] }, "locked": { @@ -335,7 +335,7 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" @@ -403,7 +403,7 @@ "nix-formatter-pack_3": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ], "nmd": "nmd_3", "nmt": "nmt_3" @@ -470,22 +470,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1658161305, @@ -504,16 +488,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1700501263, - "narHash": "sha256-M0U063Ba2DKL4lMYI7XW13Rsk5tfUXnIYiAVa39AV/0=", + "lastModified": 1700924682, + "narHash": "sha256-7vP/KtJdKSWnghtPVDoE7MD+rCY3gFj68NwOMNdrGbs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f741f8a839912e272d7e87ccf4b9dbc6012cdaf9", + "rev": "21af6ad5395bce8fab79a6bdc8dd2c33e4673650", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -658,8 +642,8 @@ "nix-formatter-pack": "nix-formatter-pack_3", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", "sf-pro-fonts-src": "sf-pro-fonts-src", + "unstable": "unstable", "vscode-server": "vscode-server" } }, @@ -749,11 +733,27 @@ "type": "github" } }, + "unstable": { + "locked": { + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs-unstable" + "unstable" ] }, "locked": { diff --git a/flake.nix b/flake.nix index 3e22b51d..ac5b5735 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,15 @@ { description = "jnsgruk's nixos configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixpkgs-unstable"; + agenix.inputs.nixpkgs.follows = "unstable"; nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack"; - nix-formatter-pack.inputs.nixpkgs.follows = "nixpkgs-unstable"; + nix-formatter-pack.inputs.nixpkgs.follows = "unstable"; hyprland.url = "github:hyprwm/Hyprland"; hyprland-contrib.url = "github:hyprwm/contrib"; @@ -18,33 +18,33 @@ sf-pro-fonts-src.flake = false; disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs-unstable"; + disko.inputs.nixpkgs.follows = "unstable"; lanzaboote.url = "github:nix-community/lanzaboote"; - lanzaboote.inputs.nixpkgs.follows = "nixpkgs-unstable"; + lanzaboote.inputs.nixpkgs.follows = "unstable"; vscode-server.url = "github:nix-community/nixos-vscode-server"; - vscode-server.inputs.nixpkgs.follows = "nixpkgs-unstable"; + vscode-server.inputs.nixpkgs.follows = "unstable"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager.inputs.nixpkgs.follows = "unstable"; crafts.url = "github:jnsgruk/crafts-flake"; # url = "path:/home/jon/crafts-flake"; - crafts.inputs.nixpkgs.follows = "nixpkgs-unstable"; + crafts.inputs.nixpkgs.follows = "unstable"; embr.url = "github:jnsgruk/firecracker-ubuntu"; - embr.inputs.nixpkgs.follows = "nixpkgs-unstable"; + embr.inputs.nixpkgs.follows = "unstable"; }; outputs = { self , nixpkgs - , nixpkgs-unstable + , unstable , nix-formatter-pack , ... } @ inputs: let inherit (self) outputs; - stateVersion = "23.05"; + stateVersion = "23.11"; username = "jon"; libx = import ./lib { inherit inputs outputs stateVersion username; }; @@ -73,7 +73,7 @@ # Custom packages; acessible via 'nix build', 'nix shell', etc packages = libx.forAllSystems (system: - let pkgs = nixpkgs-unstable.legacyPackages.${system}; + let pkgs = unstable.legacyPackages.${system}; in import ./pkgs { inherit pkgs; } ); @@ -83,13 +83,13 @@ # Devshell for bootstrapping # Accessible via 'nix develop' or 'nix-shell' (legacy) devShells = libx.forAllSystems (system: - let pkgs = nixpkgs-unstable.legacyPackages.${system}; + let pkgs = unstable.legacyPackages.${system}; in import ./shell.nix { inherit pkgs; } ); formatter = libx.forAllSystems (system: nix-formatter-pack.lib.mkFormatter { - pkgs = nixpkgs-unstable.legacyPackages.${system}; + pkgs = unstable.legacyPackages.${system}; config.tools = { deadnix.enable = true; nixpkgs-fmt.enable = true; diff --git a/host/common/services/homepage.nix b/host/common/services/homepage.nix index bc797799..91187a87 100644 --- a/host/common/services/homepage.nix +++ b/host/common/services/homepage.nix @@ -1,5 +1,5 @@ { inputs, pkgs, ... }: { - imports = [ "${inputs.nixpkgs-unstable}/nixos/modules/services/misc/homepage-dashboard.nix" ]; + imports = [ "${inputs.unstable}/nixos/modules/services/misc/homepage-dashboard.nix" ]; services.homepage-dashboard = { enable = true; diff --git a/host/common/services/servarr.nix b/host/common/services/servarr.nix index 28e90442..3ba19363 100644 --- a/host/common/services/servarr.nix +++ b/host/common/services/servarr.nix @@ -5,7 +5,7 @@ in { # Always use the prowlarr module from nixos-unstable disabledModules = [ "${inputs.nixpkgs}/${prowlarrModule}" ]; - imports = [ "${inputs.nixpkgs-unstable}/${prowlarrModule}" ]; + imports = [ "${inputs.unstable}/${prowlarrModule}" ]; services = { jellyfin = { diff --git a/host/common/virt/lxd.nix b/host/common/virt/lxd.nix index 529e573a..5a1eaa89 100644 --- a/host/common/virt/lxd.nix +++ b/host/common/virt/lxd.nix @@ -5,7 +5,7 @@ in { # Always use the lxd module from nixos-unstable disabledModules = [ "${inputs.nixpkgs}/${lxdModule}" ]; - imports = [ "${inputs.nixpkgs-unstable}/${lxdModule}" ]; + imports = [ "${inputs.unstable}/${lxdModule}" ]; virtualisation = { lxd = { enable = true; diff --git a/lib/helpers.nix b/lib/helpers.nix index c9b3d570..87983f51 100644 --- a/lib/helpers.nix +++ b/lib/helpers.nix @@ -1,7 +1,7 @@ { inputs, outputs, stateVersion, theme, username, ... }: { # Helper function for generating home-manager configs mkHome = { hostname, user ? username, desktop ? null }: inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; + pkgs = inputs.unstable.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs outputs stateVersion theme hostname desktop; username = user; @@ -10,7 +10,7 @@ }; # Helper function for generating host configs - mkHost = { hostname, desktop ? null, pkgsInput ? inputs.nixpkgs-unstable }: pkgsInput.lib.nixosSystem { + mkHost = { hostname, desktop ? null, pkgsInput ? inputs.unstable }: pkgsInput.lib.nixosSystem { specialArgs = { inherit inputs outputs stateVersion theme username hostname desktop; }; diff --git a/lib/theme/default.nix b/lib/theme/default.nix index 345c4314..ea6877bf 100644 --- a/lib/theme/default.nix +++ b/lib/theme/default.nix @@ -4,7 +4,7 @@ let inherit ((import ./colours.nix)) colours; libx = import ./lib.nix { inherit lib; }; - pkgs = import inputs.nixpkgs-unstable { + pkgs = import inputs.unstable { system = "x86_64-linux"; overlays = [ outputs.overlays.fonts ]; config = { allowUnfree = true; joypixels.acceptLicense = true; }; diff --git a/overlays/default.nix b/overlays/default.nix index 78980a6c..1a570a91 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -39,7 +39,7 @@ # When applied, the unstable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.unstable' unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { + unstable = import inputs.unstable { inherit (final) system; config.allowUnfree = true; };