diff --git a/flake.lock b/flake.lock index 68e1cc5..25fbc96 100644 --- a/flake.lock +++ b/flake.lock @@ -45,18 +45,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -123,11 +117,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -179,24 +173,6 @@ "inputs": { "systems": "systems_3" }, - "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" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -251,20 +227,19 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742326330, + "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -274,24 +249,23 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_3", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -299,11 +273,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742313775, - "narHash": "sha256-qE8XqkuoWuH2np+NNGGNG8qWN2zPa0ldAM0olaySf+s=", - "rev": "6e6ff5827276ed2c4cf549b9fa898eb1e9566e57", + "lastModified": 1742328220, + "narHash": "sha256-oRRKctwO4s4auyXPQkf8OM94Kuvh678ZL+HGFKnDKuQ=", + "rev": "3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6e6ff5827276ed2c4cf549b9fa898eb1e9566e57.tar.gz?rev=6e6ff5827276ed2c4cf549b9fa898eb1e9566e57" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a.tar.gz?rev=3fcf823a86ab9e5bf4ccc9a3cca960c1f9137e6a" }, "original": { "type": "tarball", @@ -312,13 +286,13 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": [ "lix" ], "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { @@ -389,7 +363,7 @@ "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", @@ -511,16 +485,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -602,11 +576,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -635,21 +609,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -739,21 +709,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tmux-yank": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1dca929..d355e32 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,8 @@ }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/lanzaboote/v0.4.2"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; authentik-nix = { @@ -37,7 +37,7 @@ lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.lix.follows = "lix"; }; @@ -48,13 +48,13 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; niri = { url = "github:sodiboo/niri-flake/main"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; tmux-yank = { @@ -73,6 +73,7 @@ niri, nixos-hardware, nixpkgs, + nixpkgs-unstable, sops-nix, ... }: @@ -109,7 +110,7 @@ in microvms // { - toaster = nixpkgs.lib.nixosSystem { + toaster = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ diff --git a/modules/basic-tools/nix.nix b/modules/basic-tools/nix.nix index 980ab76..a67c6a8 100644 --- a/modules/basic-tools/nix.nix +++ b/modules/basic-tools/nix.nix @@ -1,7 +1,5 @@ { - lib, pkgs, - inputs, ... }: { @@ -16,14 +14,10 @@ # nix output-monitor environment.systemPackages = [ pkgs.nix-output-monitor ]; - # override default nix shell nixpkgs# behaviour to use current flake lock - nix.registry = - let - flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs; - in - builtins.mapAttrs (_name: v: { flake = v; }) flakes; - - nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs; + nixpkgs.flake = { + setFlakeRegistry = true; + setNixPath = true; + }; nixpkgs.config.allowUnfree = true; } diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix index 54dcab0..56ee450 100644 --- a/modules/desktop-software.nix +++ b/modules/desktop-software.nix @@ -17,8 +17,9 @@ element-desktop discord mpv - dwarf-fortress-packages.dwarf-fortress-full + # dwarf-fortress-packages.dwarf-fortress-full obs-studio + firefox-wayland ]; programs.steam.enable = true; } diff --git a/modules/devtools.nix b/modules/devtools.nix index 8288862..a003e6e 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -1,8 +1,5 @@ { pkgs, - inputs, - config, - lib, ... }: { @@ -16,11 +13,6 @@ kikit-library ]; }; - - # binwalk v3 on 24.11 - sys_ver = config.system.nixos.release; - unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; - binwalkv3 = if lib.versionOlder "25.05" sys_ver then binwalk else unstablepkgs.binwalk; in [ # general @@ -29,7 +21,7 @@ gef gdb binutils - binwalkv3 + binwalk clang clang-tools direnv @@ -41,7 +33,7 @@ kikit freecad-wayland imhex - python313Full + python3Full nixfmt-rfc-style treefmt android-tools diff --git a/modules/fonts.nix b/modules/fonts.nix index a3516e9..feaee83 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -27,12 +27,7 @@ twitter-color-emoji iosevka-bin cozette - (nerdfonts.override { - fonts = [ - "Hack" - "3270" - ]; - }) + nerd-fonts.hack ]; fonts.enableDefaultPackages = true; diff --git a/modules/niri.nix b/modules/niri.nix index 1a8b59d..0a0afa8 100644 --- a/modules/niri.nix +++ b/modules/niri.nix @@ -1,8 +1,5 @@ # General Desktop-related config { pkgs, inputs, ... }: -let - unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; -in { nixpkgs.overlays = [ inputs.niri.overlays.niri ]; @@ -35,7 +32,7 @@ in bluetui gammastep graphicsmagick - unstablepkgs.i3status-rust + i3status-rust impala kanshi pamixer @@ -46,7 +43,7 @@ in banana-cursor fuzzel alacritty - unstablepkgs.i3bar-river + i3bar-river mako swww oculante