diff --git a/common.nix b/common.nix index 44ada84..c2aebb0 100644 --- a/common.nix +++ b/common.nix @@ -33,7 +33,7 @@ with builtins; jdk libsecret gh nix-prefetch-scripts fzf glab ripgrep sl lolcat appimage-run git-crypt file whois p7zip file nmap cmatrix tree socat smartmontools mprocs - dig aria2 usbutils numbat + dig aria2 usbutils ]; }; diff --git a/flake.lock b/flake.lock index e5304e5..b62c4ec 100644 --- a/flake.lock +++ b/flake.lock @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1697838989, + "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0", "type": "github" }, "original": { @@ -418,11 +418,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699169573, - "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=", + "lastModified": 1697777081, + "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b", + "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 8925751..12aaed4 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -53,12 +53,10 @@ in { device = "DELL081C:00 044E:121F Mouse"; sensitivity = 255; }; - - hardware.usb-modeswitch.enable = true; + hardware.usbWwan.enable = true; systemd.services."ModemManager".enable = true; systemd.services."ModemManager".wants = [ "NetworkManager.service" ]; systemd.services."ModemManager".wantedBy = [ "multi-user.target" ]; - programs.wireshark.enable = true; boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694"; diff --git a/justfile b/justfile index f68615b..18dab21 100644 --- a/justfile +++ b/justfile @@ -1,8 +1,5 @@ -build: - sudo nixos-rebuild switch --flake . --impure - test: sudo nixos-rebuild test --flake . --impure -update: - nix flake update --commit-lock-file \ No newline at end of file +build: + sudo nixos-rebuild switch --flake . --impure diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 734c92d..563288d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -202,6 +202,9 @@ in with lib; { yt-dlp + argyllcms + displaycal + # carapace completer carapace diff --git a/modules/desktop/networking.nix b/modules/desktop/networking.nix index 3167fb2..7a62d05 100644 --- a/modules/desktop/networking.nix +++ b/modules/desktop/networking.nix @@ -41,28 +41,6 @@ in { "10.31.208.9" = [ "mqtt.z9" ]; - "10.31.208.10" = [ - "club-assistant.ccchh.net" - ]; - "10.31.208.23" = [ - "light.z9" - "light.ccchh.net" - ]; - "10.31.210.31" = [ - "octopi.z9.ccchh.net" - ]; - "10.31.210.33" = [ - "wled-kueche.z9.ccchh.net" - ]; - "10.31.210.34" = [ - "wled-serverschrank.z9.ccchh.net" - ]; - "10.31.208.25" = [ - "zigbee2mqtt.ccchh.net" - ]; - "10.31.208.24" = [ - "esphome.ccchh.net" - ]; }; }; environment.etc = (with builtins; ( diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index 11dfb86..01a89cc 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -2,7 +2,7 @@ { config = { - fonts.packages = with pkgs; [ + fonts.fonts = with pkgs; [ atkinson-hyperlegible ]; home-manager.users.jade = { pkgs, ... }: { diff --git a/other/config.nu b/other/config.nu index f855892..cd8e7a9 100644 --- a/other/config.nu +++ b/other/config.nu @@ -151,6 +151,7 @@ $env.config = { } cd: { + abbreviations: true # allows `cd s/o/f` to expand to `cd some/other/folder` } table: { diff --git a/other/scripts/desktop/window-screenshot.nu b/other/scripts/desktop/window-screenshot.nu old mode 100755 new mode 100644 diff --git a/other/scripts/networkhooks/ccchh.nu b/other/scripts/networkhooks/ccchh.nu index 30833ae..bce6e8e 100644 --- a/other/scripts/networkhooks/ccchh.nu +++ b/other/scripts/networkhooks/ccchh.nu @@ -17,6 +17,7 @@ def main [ curl mqtt://mqtt.z9/winkekatze/katz9/eye/set -d (rand-color); curl mqtt://mqtt.z9/winkekatze/Viktoria/eye/set -d (rand-color); curl mqtt://mqtt.z9/winkekatze/allcats -d 'wink'; + mullvad connect; date now | save '/var/lib/ccchh-winken/last' -f; }