diff --git a/configs/thilo-laptop/home.nix b/configs/thilo-laptop/home.nix index 35d3481..c97f9da 100644 --- a/configs/thilo-laptop/home.nix +++ b/configs/thilo-laptop/home.nix @@ -21,6 +21,12 @@ home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; + + nix = { + package = pkgs.nixVersions.latest; + }; + + home.packages = with pkgs; [ pkgs.nixVersions.latest ]; }; }; } diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix index e9ca8fe..abc17a2 100644 --- a/configs/thilo-pc/home.nix +++ b/configs/thilo-pc/home.nix @@ -1,4 +1,9 @@ -{ inputs, pkgs, ... }: +{ + inputs, + pkgs, + config, + ... +}: { home-manager = { @@ -16,6 +21,7 @@ isGnome = false; noiseSuppression.enable = true; isGraphical = true; + nixVersion = pkgs.lix; }; /* @@ -30,7 +36,14 @@ LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; - home.packages = with pkgs; [ libsForQt5.discover ]; + nix = { + package = pkgs.lix; + }; + + home.packages = with pkgs; [ + lix + papirus-icon-theme + ]; }; }; } diff --git a/configs/wsl/home.nix b/configs/wsl/home.nix index 3625100..733ea97 100644 --- a/configs/wsl/home.nix +++ b/configs/wsl/home.nix @@ -12,4 +12,10 @@ }; nixpkgs.config.allowUnfree = true; + + nix = { + package = pkgs.nixVersions.latest; + }; + + home.packages = with pkgs; [ pkgs.nixVersions.latest ]; } diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 07f6ae2..0000000 --- a/flake.lock +++ /dev/null @@ -1,507 +0,0 @@ -{ - "nodes": { - "dagger": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718120114, - "narHash": "sha256-mQPEGOKW+8GWzdONIgNcvn9k6WeJkH1a7Fona2u5iP8=", - "owner": "dagger", - "repo": "nix", - "rev": "2db6055f392c4b41c1886e51c94717d4a5d03dbf", - "type": "github" - }, - "original": { - "owner": "dagger", - "repo": "nix", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "mmdoc": { - "inputs": { - "nixpkgs": [ - "nixpkgs-update", - "nixpkgs" - ], - "nixpkgs-for-manual": "nixpkgs-for-manual" - }, - "locked": { - "lastModified": 1669050835, - "narHash": "sha256-4ppYRBBY6lIqwMNYp0XA2mku1lSPyX4JaoTf+gt5NDg=", - "owner": "ryantm", - "repo": "mmdoc", - "rev": "cec02bafac9456bd1ed9b261b8d163a893885e5b", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "mmdoc", - "type": "github" - } - }, - "muse-sounds-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711493694, - "narHash": "sha256-u6hPaeOUsV/d/kBNo1vlG6X0/gHvTkHfCECH9pjFnV8=", - "owner": "thilobillerbeck", - "repo": "muse-sounds-manager-nix", - "rev": "06b0da28c54331d5af73efd2ebf264ce914e5936", - "type": "github" - }, - "original": { - "owner": "thilobillerbeck", - "repo": "muse-sounds-manager-nix", - "type": "github" - } - }, - "nix-alien": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nix-filter": "nix-filter", - "nix-index-database": "nix-index-database", - "nixpkgs": [ - "nix-alien", - "nix-index-database", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715754082, - "narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=", - "owner": "thiagokokada", - "repo": "nix-alien", - "rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be", - "type": "github" - }, - "original": { - "owner": "thiagokokada", - "repo": "nix-alien", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-index-database": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1715483403, - "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "f9027322f48b427da23746aa359a6510dfcd0228", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, - "nix-index-database_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718011381, - "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, - "nixgl": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "guibou", - "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", - "type": "github" - }, - "original": { - "owner": "guibou", - "repo": "nixGL", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-for-manual": { - "locked": { - "lastModified": 1663819393, - "narHash": "sha256-SMWfyAOKRPBC95M8dhZJTlb0kHyilr2lKEAfQSHlM7I=", - "owner": "ryantm", - "repo": "nixpkgs", - "rev": "6a6caacfdd079a0fa249046514480a1c4597d861", - "type": "github" - }, - "original": { - "owner": "ryantm", - "ref": "minman", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-update": { - "inputs": { - "mmdoc": "mmdoc", - "nixpkgs": "nixpkgs_3", - "runtimeDeps": "runtimeDeps", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1716350738, - "narHash": "sha256-aTwS8rp0vaDOIgirVNfYNr8swW/yG8AtOxbBoFpdD9U=", - "owner": "ryantm", - "repo": "nixpkgs-update", - "rev": "3e25ce4c5f54e790bf757ac2f17915fc8ec4fc1d", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "nixpkgs-update", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1672428209, - "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1716190602, - "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5a5ac83292c7842072318f57d68a48474f8bd34d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "dagger": "dagger", - "home-manager": "home-manager", - "muse-sounds-manager": "muse-sounds-manager", - "nix-alien": "nix-alien", - "nix-index-database": "nix-index-database_2", - "nixgl": "nixgl", - "nixpkgs": "nixpkgs_2", - "nixpkgs-update": "nixpkgs-update", - "suyu": "suyu", - "w17": "w17" - } - }, - "runtimeDeps": { - "locked": { - "lastModified": 1714247354, - "narHash": "sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c8d7c8a78fb516c0842cc65346506a565c88014d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "suyu": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1716253103, - "narHash": "sha256-OyZ/h+fPErK8RRjloV4P0SqPYO7zXDUWa3tDkTJBJhs=", - "owner": "Noodlez1232", - "repo": "suyu-flake", - "rev": "4cde0c1ba0f3aff06bf0b6883efbc62e9e7df957", - "type": "github" - }, - "original": { - "owner": "Noodlez1232", - "repo": "suyu-flake", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "w17": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1709679417, - "narHash": "sha256-I1f3QEmM/ktBVlVk9CvoBtS7/CBlgV4vSgIR20u82lc=", - "ref": "refs/heads/main", - "rev": "92b5e8a6e3710073c68a629a52a964e1ffd6c4a1", - "revCount": 2, - "type": "git", - "url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git" - }, - "original": { - "type": "git", - "url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index 3a680f3..9adea44 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -61,6 +61,10 @@ with lib; default = false; description = "Whether to enable noise suppression or not"; }; + nixVersion = mkOption { + type = types.package; + default = pkgs.nixVersions.latest; + }; }; nixGLPrefix = lib.mkOption { type = lib.types.str; diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 8f8f248..8f2aa2b 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -24,7 +24,6 @@ in home.packages = with pkgs; [ - pkgs.nixVersions.latest # because remotely invoked updates are fun ;) up htop rustc @@ -52,7 +51,7 @@ in (pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh)) (pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh)) (pkgs.writeShellScriptBin "http-server" '' - ${pkgs.caddy}/bin/caddy file-server --listen :2345 + ${pkgs.caddy}/bin/caddy file-server --listen :2345z '') (pkgs.writeShellScriptBin "nix-build-default" '' nix-build -E 'with import { }; callPackage ./default.nix { }' @@ -101,6 +100,7 @@ in [ (nixGL insomnia) (nixGL comma) + (nixGL processing) ] else [ ]