From 6eef1bfdfaa697213201e3a0ad8fef8e5f65c67c Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 16 May 2025 01:47:44 +0200 Subject: [PATCH 1/6] chore: remove old scripts and swaybg remains; fully switch to swww now. --- modules/home/hyprland/hyprland.nix | 3 +-- modules/home/scripts/scripts/lofi.sh | 7 ------- modules/home/scripts/scripts/wall-change.sh | 9 --------- modules/home/scripts/scripts/wallpaper-picker.sh | 12 ------------ 4 files changed, 1 insertion(+), 30 deletions(-) delete mode 100755 modules/home/scripts/scripts/lofi.sh delete mode 100755 modules/home/scripts/scripts/wall-change.sh delete mode 100755 modules/home/scripts/scripts/wallpaper-picker.sh diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 5c98987..ed959a4 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -1,8 +1,7 @@ { inputs, pkgs, ... }: { home.packages = with pkgs; [ - # swww - swaybg + swww inputs.hypr-contrib.packages.${pkgs.system}.grimblast hyprpicker grim diff --git a/modules/home/scripts/scripts/lofi.sh b/modules/home/scripts/scripts/lofi.sh deleted file mode 100755 index 76cdc8f..0000000 --- a/modules/home/scripts/scripts/lofi.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -if (ps aux | grep mpv | grep -v grep > /dev/null) then - pkill mpv -else - runbg mpv --no-video https://www.youtube.com/live/jfKfPfyJRdk?si=OF0HKrYFFj33BzMo -fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/wall-change.sh b/modules/home/scripts/scripts/wall-change.sh deleted file mode 100755 index 8ec034c..0000000 --- a/modules/home/scripts/scripts/wall-change.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -PIDS=$(pgrep -f "swaybg") - -swaybg -m fill -i $1 & - -if [ -n "$PIDS" ]; then - echo "$PIDS" | xargs kill -fi diff --git a/modules/home/scripts/scripts/wallpaper-picker.sh b/modules/home/scripts/scripts/wallpaper-picker.sh deleted file mode 100755 index 899ad1a..0000000 --- a/modules/home/scripts/scripts/wallpaper-picker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -wallpaper_path=$HOME/Pictures/wallpapers -wallpapers_folder=$HOME/Pictures/wallpapers/others -wallpaper_name="$(ls $wallpapers_folder | bemenu -l 15)" -if [[ -f $wallpapers_folder/$wallpaper_name ]]; then - find ~/Pictures/wallpapers -maxdepth 1 -type f -delete - cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name - wall-change $wallpaper_path/$wallpaper_name -else - exit 1 -fi From 50a5beb8b59805eba3f305f3b631ac7842bd764d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 16 May 2025 01:48:26 +0200 Subject: [PATCH 2/6] fix: update information --- modules/home/scripts/scripts/notes.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/home/scripts/scripts/notes.sh b/modules/home/scripts/scripts/notes.sh index 7d4b3cf..1644df1 100644 --- a/modules/home/scripts/scripts/notes.sh +++ b/modules/home/scripts/scripts/notes.sh @@ -1,7 +1,7 @@ #!/bin/sh # MIT license -# Ahwx https://ahwx.org - 2024 +# liv < liv at liv dot town > https://liv.town - 2024 # # Dependencies: find/grep/bemenu/ping/git/ @@ -14,9 +14,9 @@ echo "Check if connected to internet and pull changes from Git" ping -c1 github.com >/dev/null && notify-send "$(git pull)" # Pull most recent changes, be sure to not create conficts... if [ "$CHOSEN" ]; then - kitty -e nvim "$CHOSEN" # Finally open chosen note + kitty -e nvim "$CHOSEN" # Finally open chosen note - git add "$CHOSEN" && git commit -m "chore: updates (auto)" && git push && notify-send "Changes pushed" + git add "$CHOSEN" && git commit -m "chore: updates (auto)" && git push && notify-send "Changes pushed" else - exit 1 + exit 1 fi From 07ffd197ce4da691b2cc6eb6da8f813d1fc38c79 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 23 May 2025 03:31:08 +0200 Subject: [PATCH 3/6] chore: open firewall for ssh port --- modules/core/sshd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/core/sshd.nix b/modules/core/sshd.nix index 2cd550c..012b44a 100644 --- a/modules/core/sshd.nix +++ b/modules/core/sshd.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, config, ... }: { services.openssh = { enable = true; @@ -11,6 +11,8 @@ }; }; + networking.firewall.allowedTCPPorts = [ config.services.openssh.ports ]; + users.users.liv.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # main laptop "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2nsQHyWnrmuQway0ehoMUcYYfhD8Ph/vpD0Tzip1b1 liv@meow" # main phone From 3f118856840aff9bfd19b038c9b7220f8a2b13ca Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 23 May 2025 03:31:42 +0200 Subject: [PATCH 4/6] chore: move ssh port away from monitoring module, as it should be in the sshd module --- modules/services/monitoring.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/services/monitoring.nix b/modules/services/monitoring.nix index 848e838..a22d5f9 100644 --- a/modules/services/monitoring.nix +++ b/modules/services/monitoring.nix @@ -26,8 +26,6 @@ networking.firewall = { allowedTCPPorts = [ 9001 - 22 - 9123 # always also allow ssh :screaming: ]; }; } From 13294fcb09cae6a8d713f1de1f83b963266cc6e0 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 23 May 2025 03:33:29 +0200 Subject: [PATCH 5/6] feat: create vlans and add dhcpd4 as reference, since apparently its state has been changed to "deprecated" --- hosts/lily/default.nix | 93 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 6 deletions(-) diff --git a/hosts/lily/default.nix b/hosts/lily/default.nix index 2d36d14..fba412b 100644 --- a/hosts/lily/default.nix +++ b/hosts/lily/default.nix @@ -74,14 +74,93 @@ in }; }; }; + + # <100 is trusted; =>100 is untrusted. + vlans = { + lan = { + id = 1; + interface = "lan1"; + }; + servers = { + id = 10; + interface = "lan1"; + }; + management = { + id = 21; + interface = "lan1"; + }; + iot = { + id = 100; + interface = "lan1"; + }; + guest = { + id = 110; + interface = "lan1"; + }; + }; }; - services.udev.extraRules = '' - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:47:67:6e", ATTR{type}=="1", NAME="wan0" - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:47:67:6f", ATTR{type}=="1", NAME="lan0" - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:63:0f:80", ATTR{type}=="1", NAME="lan1" - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:63:0f:81", ATTR{type}=="1", NAME="lan2" - ''; + services = { + udev.extraRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:47:67:6e", ATTR{type}=="1", NAME="wan0" + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:47:67:6f", ATTR{type}=="1", NAME="lan0" + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:63:0f:80", ATTR{type}=="1", NAME="lan1" + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:25:90:63:0f:81", ATTR{type}=="1", NAME="lan2" + ''; + dhcpd4 = { + enable = true; + interfaces = [ + "lan" + "servers" + "management" + "iot" + "guest" + ]; + extraConfig = '' + option domain-name-servers 9.9.9.9, 149.112.112.112; + option subnet-mask 255.255.255.0; + + subnet 172.16.1.0 netmask 255.255.255.0 { + option broadcast-address 172.16.1.255; + option routers 172.16.1.1; + interface lan; + range 172.16.1.50 172.16.1.254; + } + subnet 172.16.10.0 netmask 255.255.255.0 { + option broadcast-address 172.16.10.255; + option routers 172.16.10.1; + interface servers; + range 172.16.10.50 172.16.10.254; + } + subnet 172.16.21.0 netmask 255.255.255.0 { + option broadcast-address 172.16.21.255; + option routers 172.16.21.1; + interface management; + range 172.16.21.50 172.16.21.254; + } + subnet 172.16.100.0 netmask 255.255.255.0 { + option broadcast-address 172.16.100.255; + option routers 172.16.100.1; + interface iot; + range 172.16.100.50 172.16.100.254; + } + subnet 172.16.110.0 netmask 255.255.255.0 { + option broadcast-address 172.16.110.255; + option routers 172.16.110.1; + interface guest; + range 172.16.110.50 172.16.110.254; + } + ''; + }; + avahi = { + enable = true; + reflector = true; + interfaces = [ + "lan" + "iot" + ]; + }; + }; networking.hostName = "lily"; @@ -91,5 +170,7 @@ in kitty.terminfo tcpdump dnsutils + bind + ethtool ]; } From 0de00b4a9c1b7935bbd12ebd102632f04a543056 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 23 May 2025 12:39:08 +0200 Subject: [PATCH 6/6] feat: adds floating kitty on `mainMod+bspc` --- modules/home/hyprland/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 151c278..8484878 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -214,6 +214,7 @@ bind = [ # keybindings "$mainMod, Return, exec, kitty" + "$mainMod, Backspace, exec, [float; center; size 950 650] kitty" "$mainMod, Q, killactive," "$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar "$mainMod, Space, togglefloating,"