diff --git a/flake.lock b/flake.lock index c0f0577..24976e0 100644 --- a/flake.lock +++ b/flake.lock @@ -291,15 +291,16 @@ ] }, "locked": { - "lastModified": 1733354384, - "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -439,16 +440,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -469,6 +470,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -584,6 +601,7 @@ "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "private": "private", "rustybar": "rustybar", diff --git a/flake.nix b/flake.nix index 930f765..ab5c1ae 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ inputs = { nixos-hardware.url = "github:nixos/nixos-hardware"; utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; artemist = { url = "git+https://git.mildlyfunctional.gay/artemist/packages.git"; inputs.nixpkgs.follows = "nixpkgs"; @@ -21,7 +22,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { diff --git a/sets/base.nix b/sets/base.nix index bfa9b72..3f002cb 100644 --- a/sets/base.nix +++ b/sets/base.nix @@ -9,6 +9,7 @@ imports = [ inputs.lix-module.nixosModules.default inputs.private.nixosModules.base + ./nixpkgs-unstable.nix ]; nix = { diff --git a/sets/fonts.nix b/sets/fonts.nix index 5c54abd..264d757 100644 --- a/sets/fonts.nix +++ b/sets/fonts.nix @@ -111,7 +111,8 @@ nasin-nanpa # Weird symbols - nerd-fonts.symbols-only + # nerd-fonts.symbols-only + (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) ] ++ (builtins.attrValues pkgs.extraFonts); }; diff --git a/sets/hardware.nix b/sets/hardware.nix index b25b411..19c4819 100644 --- a/sets/hardware.nix +++ b/sets/hardware.nix @@ -11,7 +11,7 @@ ]; environment.systemPackages = with pkgs; [ - cynthion + # cynthion glasgow jlink kicad diff --git a/sets/nixpkgs-unstable.nix b/sets/nixpkgs-unstable.nix new file mode 100644 index 0000000..e9de7bd --- /dev/null +++ b/sets/nixpkgs-unstable.nix @@ -0,0 +1,16 @@ +{ + lib, + config, + inputs, + ... +}: +{ + options.artemist.pkgs-unstable = lib.mkOption { + type = lib.types.pkgs; + internal = true; + }; + + config.artemist.pkgs-unstable = import inputs.nixpkgs-unstable { + inherit (config.nixpkgs.hostPlatform) system; + }; +} diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 3be6e08..52d5a9a 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -115,8 +115,6 @@ ]; environment.systemPackages = with pkgs; [ - attic-client - dolphin-emu mgba pcsx2 @@ -126,11 +124,11 @@ amdgpu_top uhk-agent - (pkgs.beets-unstable.override { + (config.artemist.pkgs-unstable.beets-unstable.override { pluginOverrides = { alternatives = { enable = true; - propagatedBuildInputs = [ pkgs.beetsPackages.alternatives ]; + propagatedBuildInputs = [ config.artemist.pkgs-unstable.beetsPackages.alternatives ]; }; }; })