diff --git a/flake.lock b/flake.lock index 590e06c..e73d8ca 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1744637480, - "narHash": "sha256-e8QS5UFbAtu3mDM++/lEiPPCAHF2srtlfx5NknXFAxY=", + "lastModified": 1746187242, + "narHash": "sha256-wtfhdDEPsxKYaJHCt0+eYaLm9pFVw594MZzQqP6iIE0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "189196df2cf700fa07619ff3a3e3851df69c5001", + "rev": "982ed2da17695d932b695eacaec05c8ca053f8fc", "type": "gitlab" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1744637364, - "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", + "lastModified": 1746193516, + "narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", "owner": "nix-community", "repo": "home-manager", - "rev": "337541447773985f825512afd0f9821a975186be", + "rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "mnw": { "locked": { - "lastModified": 1744592022, - "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=", + "lastModified": 1745705214, + "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653", + "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744473229, - "narHash": "sha256-rGXvIsD/Hn+bJRFb7hqSx7UUZUIlxXs0fM6ix5+iT5w=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52d0eded529af34e91df6b2a2bc32eb636637cd2", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1744639354, - "narHash": "sha256-AwUtAeDokimPucrPVj0YuoFWZ/xFVL4wy2wxZN5+u20=", + "lastModified": 1746052492, + "narHash": "sha256-1O7oXrrzGij2HwbwwLcbGNM5UbqFXTRb1q59lzE71jM=", "owner": "notashelf", "repo": "nvf", - "rev": "f516cb43ceb2b071e6b9a6d5c9d681c8a3187f5f", + "rev": "ef3928be60ffee84062a0db4392834b339833245", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1744518500, - "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { diff --git a/modules/home/apps/spotify/default.nix b/modules/home/apps/spotify/default.nix index 31591a0..14666f4 100644 --- a/modules/home/apps/spotify/default.nix +++ b/modules/home/apps/spotify/default.nix @@ -17,8 +17,7 @@ in config = mkIf cfg.enable { home.packages = with pkgs; [ - librespot - spotify-qt + spotify ]; }; diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix index 58ac3ac..67bbdc7 100644 --- a/modules/home/cli-apps/fish/default.nix +++ b/modules/home/cli-apps/fish/default.nix @@ -19,8 +19,7 @@ in programs.fish = { enable = true; shellAliases = { - hm-update = "home-manager switch --flake ~/Documents/nix-config/ -b bk &| nom"; - nix-update = "sudo sh -c 'nixos-rebuild --log-format internal-json -v switch --flake /home/philipp/Documents/nix-config/ |& nom --json'"; + nix-dns = "nixos-rebuild switch --flake .#dns --target-host dns-1 --use-remote-sudo && nixos-rebuild switch --flake .#dns --target-host dns-2 --use-remote-sudo"; cd = "z"; }; plugins = [ diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix index 03fdf03..14e79ba 100644 --- a/modules/nixos/hardware/audio/default.nix +++ b/modules/nixos/hardware/audio/default.nix @@ -25,6 +25,9 @@ in wireplumber.enable = true; }; + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1235", ATTR{idProduct}=="8202", TEST=="power/control", ATTR{power/control}="on" + ''; services.pulseaudio.enable = false; environment.systemPackages = diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index fe232ff..5d75606 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -68,7 +68,7 @@ in noto-fonts-cjk-serif noto-fonts-emoji nerd-fonts.hack - (pkgs.awesome-flake.ttf-ms-win11.override { acceptEula = true; }) + #(pkgs.awesome-flake.ttf-ms-win11.override { acceptEula = true; }) ] ++ cfg.fonts; }; diff --git a/systems/x86_64-linux/bodenheizung/default.nix b/systems/x86_64-linux/bodenheizung/default.nix index 3edaa93..2bcf658 100644 --- a/systems/x86_64-linux/bodenheizung/default.nix +++ b/systems/x86_64-linux/bodenheizung/default.nix @@ -23,6 +23,7 @@ with lib.${namespace}; virtualisation.libvirtd.enable = true; nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowBroken = false; nix.settings.experimental-features = [ "nix-command" @@ -66,7 +67,6 @@ with lib.${namespace}; services = { btrfs = enabled; - gns3 = enabled; }; system = { diff --git a/systems/x86_64-linux/dns-1/default.nix b/systems/x86_64-linux/dns/default.nix similarity index 84% rename from systems/x86_64-linux/dns-1/default.nix rename to systems/x86_64-linux/dns/default.nix index b49edee..ef20ab2 100644 --- a/systems/x86_64-linux/dns-1/default.nix +++ b/systems/x86_64-linux/dns/default.nix @@ -10,11 +10,13 @@ with lib.${namespace}; documentation.man.generateCaches = false; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - + nix.settings = { + trusted-users = [ "philipp" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; users.users.philipp = { isNormalUser = true; description = "Philipp Böhm";