From bc52fce5db457528d12f16068da4234aafe9da91 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 6 Nov 2023 11:18:25 +0100 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/ae631b0b20f06f7d239d160723d228891ddb2fe0' (2023-10-20) → 'github:nix-community/home-manager/8765d4e38aa0be53cdeee26f7386173e6c65618d' (2023-11-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7c9cc5a6e5d38010801741ac830a3f8fd667a7a0' (2023-10-19) → 'github:NixOS/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/679cadfdfed2b90311a247b2d6ef6dfd3d6cab73' (2023-10-20) → 'github:NixOS/nixpkgs/aeefe2054617cae501809b82b44a8e8f7be7cc4b' (2023-11-05) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b62c4ec..e5304e5 100644 --- a/flake.lock +++ b/flake.lock @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1697838989, - "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -418,11 +418,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697777081, - "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=", + "lastModified": 1699169573, + "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73", + "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { From a6dbb351ef265d9e64b1c1c38eb3b5904dfc861f Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 7 Nov 2023 08:05:47 +0100 Subject: [PATCH 2/2] updates people, updates! --- common.nix | 2 +- hosts/catbook-j/configuration.nix | 4 +++- justfile | 7 +++++-- modules/desktop/default.nix | 3 --- modules/desktop/networking.nix | 22 ++++++++++++++++++++++ modules/desktop/themeing.nix | 2 +- other/config.nu | 1 - other/scripts/desktop/window-screenshot.nu | 0 other/scripts/networkhooks/ccchh.nu | 1 - 9 files changed, 32 insertions(+), 10 deletions(-) mode change 100644 => 100755 other/scripts/desktop/window-screenshot.nu diff --git a/common.nix b/common.nix index c2aebb0..44ada84 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 + dig aria2 usbutils numbat ]; }; diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 12aaed4..8925751 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -53,10 +53,12 @@ in { device = "DELL081C:00 044E:121F Mouse"; sensitivity = 255; }; - hardware.usbWwan.enable = true; + + hardware.usb-modeswitch.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 18dab21..f68615b 100644 --- a/justfile +++ b/justfile @@ -1,5 +1,8 @@ +build: + sudo nixos-rebuild switch --flake . --impure + test: sudo nixos-rebuild test --flake . --impure -build: - sudo nixos-rebuild switch --flake . --impure +update: + nix flake update --commit-lock-file \ No newline at end of file diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 563288d..734c92d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -202,9 +202,6 @@ in with lib; { yt-dlp - argyllcms - displaycal - # carapace completer carapace diff --git a/modules/desktop/networking.nix b/modules/desktop/networking.nix index 7a62d05..3167fb2 100644 --- a/modules/desktop/networking.nix +++ b/modules/desktop/networking.nix @@ -41,6 +41,28 @@ 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 01a89cc..11dfb86 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -2,7 +2,7 @@ { config = { - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ atkinson-hyperlegible ]; home-manager.users.jade = { pkgs, ... }: { diff --git a/other/config.nu b/other/config.nu index cd8e7a9..f855892 100644 --- a/other/config.nu +++ b/other/config.nu @@ -151,7 +151,6 @@ $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 100644 new mode 100755 diff --git a/other/scripts/networkhooks/ccchh.nu b/other/scripts/networkhooks/ccchh.nu index bce6e8e..30833ae 100644 --- a/other/scripts/networkhooks/ccchh.nu +++ b/other/scripts/networkhooks/ccchh.nu @@ -17,7 +17,6 @@ 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; }