From 9da6b54f5ceedebae047ad62b94cb58a87b00577 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sat, 30 Aug 2025 01:51:31 +0200 Subject: [PATCH] i hate nix --- common.nix | 2 - flake.lock | 88 +++++++++++----------- flake.nix | 2 +- justfile | 4 +- modules/desktop-legacy/default.nix | 1 - modules/editors/discord-presence-lsp.nix | 4 +- modules/hardware/wacom.nix | 2 +- modules/media/default.nix | 1 - modules/net/dispatchers/hooks/WIFIonICE.nu | 8 ++ modules/shell/git.nix | 2 +- 10 files changed, 59 insertions(+), 55 deletions(-) create mode 100644 modules/net/dispatchers/hooks/WIFIonICE.nu diff --git a/common.nix b/common.nix index 42c7faa..7d6e511 100644 --- a/common.nix +++ b/common.nix @@ -76,8 +76,6 @@ with builtins; hardware.graphics.enable = true; - virtualisation.waydroid.enable = true; - services = { systemd-lock-handler.enable = true; openssh = { diff --git a/flake.lock b/flake.lock index c555f64..9ca8187 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ }, "crane": { "locked": { - "lastModified": 1755537552, - "narHash": "sha256-Tg+P8kFIneqnQLT8E0QqlCrldtdLo1n1y619/mxRD44=", + "lastModified": 1755993354, + "narHash": "sha256-FCRRAzSaL/+umLIm3RU3O/+fJ2ssaPHseI2SSFL8yZU=", "owner": "ipetkov", "repo": "crane", - "rev": "3c40c97e1881fff381e4615e82557b333edf65c4", + "rev": "25bd41b24426c7734278c2ff02e53258851db914", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1755914636, - "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", + "lastModified": 1756496801, + "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", + "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1755945570, - "narHash": "sha256-KKxBCVhKuTdN5gdph4Nw1x2XJ7VN2dcWYvSgNt8hRgQ=", - "rev": "be438c62e1bd62a1fa6882e93f03538d590d8204", + "lastModified": 1756265386, + "narHash": "sha256-AGzXkcbafClvd31K/C/Nb9MByIws+WV0lYKQ1JzvVQA=", + "rev": "fe6395cd4d7aa1ffd415cb2267ff431b5c66152f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/be438c62e1bd62a1fa6882e93f03538d590d8204.tar.gz?rev=be438c62e1bd62a1fa6882e93f03538d590d8204" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fe6395cd4d7aa1ffd415cb2267ff431b5c66152f.tar.gz?rev=fe6395cd4d7aa1ffd415cb2267ff431b5c66152f" }, "original": { "type": "tarball", @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1755826886, - "narHash": "sha256-AzCj0tc+JHFg74VqvLYgro5xSJ6eT0NoS6zxhavc4eo=", - "rev": "71bd6a06def2404b7e0f68e57bf5a08c634f5041", + "lastModified": 1756125573, + "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", + "rev": "1c906dd92e032bcb5a27f98cf53833cae889537f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/71bd6a06def2404b7e0f68e57bf5a08c634f5041.tar.gz?rev=71bd6a06def2404b7e0f68e57bf5a08c634f5041" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/1c906dd92e032bcb5a27f98cf53833cae889537f.tar.gz?rev=1c906dd92e032bcb5a27f98cf53833cae889537f" }, "original": { "type": "tarball", @@ -360,11 +360,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755966765, - "narHash": "sha256-mKOwqh+7prfQR4glQsPGG4maOm8/n89sF8ujWkoGnlU=", + "lastModified": 1756451209, + "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3266023d4bb7968fdbec2c598a22a50ae98f031b", + "rev": "cdfffe0b009582f5161dcd030a5549236287767b", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755879086, - "narHash": "sha256-fUQ1iuR2/7UrHQ7LXRJ8a2DahcyTard4WvL/wQ18SII=", + "lastModified": 1756448032, + "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", "owner": "YaLTeR", "repo": "niri", - "rev": "2865ec3e47fa0b170f82f4beeefa56a5ea49d133", + "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755966580, - "narHash": "sha256-mtt+7HwY1gqvdbPfy+j1KBwL2UwHrqeLdhJ4mFaLcAM=", + "lastModified": 1756430462, + "narHash": "sha256-7eyB++u0w76rIeWK9Ro0m9xA6x1RUrTwkLWQG4FF2oE=", "owner": "kaylorben", "repo": "nixcord", - "rev": "d49346b8f3d0d291b00c6891e4f03e64b9b38bad", + "rev": "6224976ea28552c7dc0ceaa189e7d9a5b80875f6", "type": "github" }, "original": { @@ -428,11 +428,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1756217674, + "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "type": "github" }, "original": { @@ -516,11 +516,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1755946490, - "narHash": "sha256-mDVU9+uFH0yK7haVmTh1ZjhtULLBsUBQuajvaqAKuJY=", + "lastModified": 1756487429, + "narHash": "sha256-dKmUp2Z5JS8exaYq4+2TnjzzLSyYMpCvCGaCxMAnD1I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "465265a5c60eeef10fcd291c32175b86a1bb9182", + "rev": "84fddb6f4ccf28d904b0d82d1878c36f94c6b629", "type": "github" }, "original": { @@ -547,11 +547,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756386758, + "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755708361, - "narHash": "sha256-RmqBx2EamhIk0WVhQSNb8iehaVhilO7D0YAnMoFPqJQ=", + "lastModified": 1755997543, + "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", "owner": "danth", "repo": "stylix", - "rev": "2355da455d7188228aaf20ac16ea9386e5aa6f0c", + "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", "type": "github" }, "original": { @@ -881,11 +881,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755963545, - "narHash": "sha256-hGXzVhlk+gelqagKAgOHbilNYasM+jM3T8JPshDl2/M=", + "lastModified": 1756260173, + "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "d759c64681bab7cd34f48122037d7420d42f3024", + "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 778eb68..a68902f 100644 --- a/flake.nix +++ b/flake.nix @@ -146,7 +146,7 @@ inherit pkgs-unstable-small pkgs-stable typst-within; }; home-manager.sharedModules = [ - inputs.nixcord.homeManagerModules.nixcord + inputs.nixcord.homeModules.nixcord ]; home-manager.users.jade = { diff --git a/justfile b/justfile index fbe035d..76fb10c 100644 --- a/justfile +++ b/justfile @@ -4,10 +4,10 @@ test: sudo nixos-rebuild test --flake . --log-format multiline build: - sudo nixos-rebuild switch --flake . --fast --log-format multiline + sudo nixos-rebuild switch --flake . --log-format multiline tbuild: - sudo nixos-rebuild switch --flake . --fast --log-format multiline-with-logs --show-trace + sudo nixos-rebuild switch --flake . --no-reexec --log-format multiline-with-logs --show-trace update: nix flake update --commit-lock-file --log-format multiline diff --git a/modules/desktop-legacy/default.nix b/modules/desktop-legacy/default.nix index 7ddb6ef..17932c5 100644 --- a/modules/desktop-legacy/default.nix +++ b/modules/desktop-legacy/default.nix @@ -49,7 +49,6 @@ with lib; # from environment.systemPackages cleanup virt-manager - ddccontrol-db ]; }; } diff --git a/modules/editors/discord-presence-lsp.nix b/modules/editors/discord-presence-lsp.nix index 995b20d..cb80c04 100644 --- a/modules/editors/discord-presence-lsp.nix +++ b/modules/editors/discord-presence-lsp.nix @@ -2,13 +2,13 @@ (pkgs.rustPlatform.buildRustPackage rec { pname = "discord-presence-lsp"; version = "200ae73131a098516025e4fd5269d8c8cb6144f6"; - cargoHash = "sha256-JLNCEeo9fKeV4vTtPs+Yj2wRO1RKP2fuetrPlXcPBjA="; + cargoHash = "sha256-2hQHhrbUYKDtFX8ZiDpVYrd9/g6bCi9XL0VwKDWFE+s="; src = pkgs.fetchFromGitHub { owner = "xhyrom"; repo = "zed-discord-presence"; rev = version; - hash = "sha256-RmpY0xkJYNDYn6SWNdKGpPetmBxf2/xY25FLeJqf0Po="; + hash = "sha256-6KpjJajibMY7pBR5XhZf2KPBkBMkdcYKutifNdF3Hko="; }; cargoBuildFlags = "--package discord-presence-lsp"; diff --git a/modules/hardware/wacom.nix b/modules/hardware/wacom.nix index 0234f30..62873b3 100644 --- a/modules/hardware/wacom.nix +++ b/modules/hardware/wacom.nix @@ -7,7 +7,7 @@ home.packages = [ # TODO: figure out if the previous enabled option depends on these anyway pkgs.libwacom - pkgs.wacomtablet + pkgs.kdePackages.wacomtablet ]; }; } diff --git a/modules/media/default.nix b/modules/media/default.nix index e1e0069..450040b 100644 --- a/modules/media/default.nix +++ b/modules/media/default.nix @@ -51,7 +51,6 @@ with lib; mpv evince nomacs - jellyfin-media-player (mkIf cfg.videoEditing kdePackages.kdenlive) (mkIf cfg.videoEditing glaxnimate) diff --git a/modules/net/dispatchers/hooks/WIFIonICE.nu b/modules/net/dispatchers/hooks/WIFIonICE.nu new file mode 100644 index 0000000..a2ba1c6 --- /dev/null +++ b/modules/net/dispatchers/hooks/WIFIonICE.nu @@ -0,0 +1,8 @@ +def main [ + interface: string + type: string +] { + mullvad disconnect; + http post 'https://login.wifionice.de/cna/logon' ''; + mullvad connect; +} diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 8960978..7133bcb 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -26,7 +26,7 @@ }; signing = { format = "ssh"; - key = lib.mkDefault "${pkgs.writeText "blue_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILg7hhAKxIAbokHHcIj9HBgbkgoKGCG2R+gx7HZKL+iz cardno:000F_93C6A612"}"; + key = lib.mkDefault "${pkgs.writeText "blue_nk3.pub" "256 SHA256:h7d9+w4uACtz63L/MI7B1oB3fYxh8u+q6bs+SsSTKzY ssh:"}"; signByDefault = true; }; };