diff --git a/flake.lock b/flake.lock index 7b5e20d..3fa907a 100644 --- a/flake.lock +++ b/flake.lock @@ -42,27 +42,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720553833, - "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720657034, - "narHash": "sha256-nPhbeFdyN8yn+EXmnPcBWisoypndtQbNIhSKmAinv3E=", + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "212defe037698e18fc9521dfe451779a8979844c", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", "type": "github" }, "original": { @@ -73,6 +73,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1718419000, "narHash": "sha256-v4+aJpRDbJil691DXo5SydqowcB01B6E9+wFH/pNk6k=", @@ -90,21 +106,20 @@ }, "paste-py": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1718472648, - "narHash": "sha256-eugtFG0Z2uycs29m9XsezGoE7xBWYD7EaysDH4+RMz4=", - "rev": "fd4b051067a09b1f76df5516514330e0d53398f7", - "revCount": 126, + "lastModified": 1733345422, + "narHash": "sha256-wVnHQo9BvDmvADq6nnMoDuHQOXhTUVJgEIbwZXge8JI=", + "ref": "refs/heads/pastisserie", + "rev": "27a639f5aaf970b1ccfc1657541abed7a874aea3", + "revCount": 127, "type": "git", "url": "https://github.com/Armael/paste-py" }, "original": { - "rev": "fd4b051067a09b1f76df5516514330e0d53398f7", + "rev": "27a639f5aaf970b1ccfc1657541abed7a874aea3", "type": "git", "url": "https://github.com/Armael/paste-py" } @@ -113,7 +128,7 @@ "inputs": { "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, diff --git a/flake.nix b/flake.nix index 560306d..78ea3ec 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.paste-py.url = "git+https://github.com/Armael/paste-py?rev=fd4b051067a09b1f76df5516514330e0d53398f7"; - inputs.paste-py.inputs.nixpkgs.follows = "nixpkgs"; + inputs.paste-py.url = "git+https://github.com/Armael/paste-py?rev=27a639f5aaf970b1ccfc1657541abed7a874aea3"; + # inputs.paste-py.inputs.nixpkgs.follows = "nixpkgs"; outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations."oven" = nixpkgs.lib.nixosSystem { diff --git a/pastila/configuration.nix b/pastila/configuration.nix index e093834..188e524 100644 --- a/pastila/configuration.nix +++ b/pastila/configuration.nix @@ -36,9 +36,6 @@ in boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; - # use the latest kernel compatible with zfs - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - # setup automatic snapshots (~short term: retain no more than 1 month) services.zfs.autoSnapshot = { enable = true; @@ -80,7 +77,7 @@ in environment.systemPackages = with pkgs; [ irssi weechat - transmission + transmission_3 tremc unstable.poezio ];