From a6dbb351ef265d9e64b1c1c38eb3b5904dfc861f Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 7 Nov 2023 08:05:47 +0100 Subject: [PATCH] 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; }