diff --git a/common/guest.nix b/common/guest.nix index 7183bc1..2084b97 100644 --- a/common/guest.nix +++ b/common/guest.nix @@ -32,7 +32,6 @@ in # FIXME: possibly expose home modules through flake outputs instead of brittle path traversals users.gast = { imports = [ - inputs.nur.hmModules.nur ../home/modules/packages.nix ]; home = { diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix index 6ca211a..ed94170 100644 --- a/common/pulseaudio.nix +++ b/common/pulseaudio.nix @@ -12,4 +12,5 @@ zeroconf.discovery.enable = true; zeroconf.publish.enable = true; }; + services.pipewire.enable = false; # conflicts otherwise } diff --git a/flake.lock b/flake.lock index 8b00e7e..9cfe4ea 100644 --- a/flake.lock +++ b/flake.lock @@ -70,6 +70,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -117,11 +138,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -194,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -210,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -258,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733120037, - "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -272,13 +293,34 @@ "type": "github" } }, - "nur": { + "nixpkgs_3": { "locked": { - "lastModified": 1733260004, - "narHash": "sha256-Uem1KaDdvbHcTxii4t1fuuFsJlC7WeEjmXH+i1ElR/I=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1733663205, + "narHash": "sha256-7O+8rbX8eMBp4ZljoYcgXWx8n1u2rBL+Bfz387g87tA=", "owner": "nix-community", "repo": "NUR", - "rev": "0c7ae4a63afbc6c305e401a06191380027f5ec73", + "rev": "ba5f9019335390ab605713c9e56428f031ba2a35", "type": "github" }, "original": { @@ -328,7 +370,7 @@ "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nur": "nur", - "treefmt-nix": "treefmt-nix", + "treefmt-nix": "treefmt-nix_2", "utils": "utils" } }, @@ -388,6 +430,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 0fac46e..8a5a03a 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,6 @@ modules = [ { imports = [ - nur.hmModules.nur ./home/common.nix ./home/${confName}.nix ]; diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 05aa897..6ce1185 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -15,7 +15,7 @@ twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) - config.nur.repos.schmittlauch.vollkorn + inputs.nur.legacyPackages.${system}.repos.schmittlauch.vollkorn # TODO: humor-sans # fcio corporate design, TODO module diff --git a/home/modules/packages.nix b/home/modules/packages.nix index a164d91..1d946fe 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -10,6 +10,7 @@ with pkgs; let cfg = config.schmittlauch.packages; unstable = inputs.nixos-unstable.legacyPackages.${system}; + nur = inputs.nur.legacyPackages.${system}; graphicsApps = [ @@ -41,7 +42,7 @@ let musescore tenacity soundkonverter - #config.nur.repos.fooker.studio-link + #nur.repos.fooker.studio-link ]; cliApps = @@ -86,7 +87,7 @@ let torsocks agrep reptyr # re-bind running program to other tty - config.nur.repos.schmittlauch.lolcommits + nur.repos.schmittlauch.lolcommits ]; nixHelpers = [