From a7f24d1d6777fcd8aceb7f10832e2a4ae639859d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Mon, 25 Aug 2025 22:50:19 +0200 Subject: [PATCH] chore: update flake --- SwarselSystems.org | 11 ++++++----- files/scripts/swarselcheck-niri.sh | 4 ++-- files/scripts/swarselcheck.sh | 4 ++-- flake.lock | 18 +++++++++--------- modules/nixos/server/nfs.nix | 3 ++- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index 3150785..aac8047 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -6264,7 +6264,8 @@ Here we just define some aliases for rebuilding the system, and we allow some in services = { # add a user with sudo smbpasswd -a samba = { - package = pkgs.samba4Full; + # package = pkgs.samba4Full; + package = pkgs.samba4; # extraConfig = '' # workgroup = WORKGROUP # server role = standalone server @@ -15383,7 +15384,7 @@ This app checks for different apps that I keep around in the scratchpad for quic STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true) CHECK=$(swaymsg -t get_tree | grep kittyterm || true) if [ "$CHECK" == "" ]; then - exec kitty -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm & + exec kitty --app-id kittyterm -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm & sleep 1 fi if [ "$STR" == "" ]; then @@ -15409,7 +15410,7 @@ This app checks for different apps that I keep around in the scratchpad for quic STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true) CHECK=$(swaymsg -t get_tree | grep spotifytui || true) if [ "$CHECK" == "" ]; then - exec kitty -T spotifytui -o confirm_os_window_close=0 spotify_player & + exec kitty --add-id spotifytui -T spotifytui -o confirm_os_window_close=0 spotify_player & sleep 1 fi if [ "$STR" == "" ]; then @@ -15436,7 +15437,7 @@ This app checks for different apps that I keep around in the scratchpad for quic while :; do case ${1:-} in -k | --kitty) - cmd=(sh -c 'kitty --app-id kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm' '&') + cmd=(sh -c 'kitty --app-id kittyterm -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm' '&') searchapp="kittyterm" ;; -e | --element) @@ -15448,7 +15449,7 @@ This app checks for different apps that I keep around in the scratchpad for quic searchapp="vesktop" ;; -s | --spotifyplayer) - cmd=(sh -c 'kitty --add-id spotifytui -o confirm_os_window_close=0 spotify_player' '&') + cmd=(sh -c 'kitty --add-id spotifytui -T spotifytui -o confirm_os_window_close=0 spotify_player' '&') searchapp="spotifytui" ;; ,*) break ;; diff --git a/files/scripts/swarselcheck-niri.sh b/files/scripts/swarselcheck-niri.sh index f0b2143..6bfb966 100644 --- a/files/scripts/swarselcheck-niri.sh +++ b/files/scripts/swarselcheck-niri.sh @@ -1,7 +1,7 @@ while :; do case ${1:-} in -k | --kitty) - cmd=(sh -c 'kitty --app-id kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm' '&') + cmd=(sh -c 'kitty --app-id kittyterm -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm' '&') searchapp="kittyterm" ;; -e | --element) @@ -13,7 +13,7 @@ while :; do searchapp="vesktop" ;; -s | --spotifyplayer) - cmd=(sh -c 'kitty --add-id spotifytui -o confirm_os_window_close=0 spotify_player' '&') + cmd=(sh -c 'kitty --add-id spotifytui -T spotifytui -o confirm_os_window_close=0 spotify_player' '&') searchapp="spotifytui" ;; *) break ;; diff --git a/files/scripts/swarselcheck.sh b/files/scripts/swarselcheck.sh index e941f1b..b581068 100644 --- a/files/scripts/swarselcheck.sh +++ b/files/scripts/swarselcheck.sh @@ -25,7 +25,7 @@ if [[ $kitty -eq 1 ]]; then STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep kittyterm || true) CHECK=$(swaymsg -t get_tree | grep kittyterm || true) if [ "$CHECK" == "" ]; then - exec kitty -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm & + exec kitty --app-id kittyterm -T kittyterm -o confirm_os_window_close=0 zellij attach --create kittyterm & sleep 1 fi if [ "$STR" == "" ]; then @@ -51,7 +51,7 @@ elif [[ $spotifyplayer -eq 1 ]]; then STR=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]) | select(.name == "__i3_scratch")' | grep spotifytui || true) CHECK=$(swaymsg -t get_tree | grep spotifytui || true) if [ "$CHECK" == "" ]; then - exec kitty -T spotifytui -o confirm_os_window_close=0 spotify_player & + exec kitty --add-id spotifytui -T spotifytui -o confirm_os_window_close=0 spotify_player & sleep 1 fi if [ "$STR" == "" ]; then diff --git a/flake.lock b/flake.lock index 7275056..feca779 100644 --- a/flake.lock +++ b/flake.lock @@ -2521,11 +2521,11 @@ }, "nixpkgs-dev": { "locked": { - "lastModified": 1755895490, - "narHash": "sha256-BIqIaeWsmrSxIs/oUg5hjo0/ZU0d5pf5RkPvcQGRilc=", + "lastModified": 1756088794, + "narHash": "sha256-aBaRmk3lNNUm/1H1Jf6hA8miLg3HsYEhcuxUXTGa2gw=", "owner": "Swarsel", "repo": "nixpkgs", - "rev": "526b9d738fc2af2eb010b996b9b5918b46e7cf92", + "rev": "2d9f8b36adb25667fbc313f141444dea4d496850", "type": "github" }, "original": { @@ -3306,11 +3306,11 @@ }, "nixpkgs_27": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -4491,11 +4491,11 @@ "systems": "systems_17" }, "locked": { - "lastModified": 1754895103, - "narHash": "sha256-v8t5EjfbDurvTCBVHtFSRL+m5OfCPpTMmgzVC7h93sU=", + "lastModified": 1756088962, + "narHash": "sha256-YkCFGvVfT3TcXTIhnzctUCft5Do8NIwTGqwToKUMY3Y=", "owner": "Swarsel", "repo": "swarsel-modules", - "rev": "4e779044540278b93171d846c71d2bd7823fd806", + "rev": "f1ceec3b17ed4b009ee9bac92c14308f57bcedb7", "type": "github" }, "original": { diff --git a/modules/nixos/server/nfs.nix b/modules/nixos/server/nfs.nix index d2d97da..746a583 100644 --- a/modules/nixos/server/nfs.nix +++ b/modules/nixos/server/nfs.nix @@ -8,7 +8,8 @@ in services = { # add a user with sudo smbpasswd -a samba = { - package = pkgs.samba4Full; + # package = pkgs.samba4Full; + package = pkgs.samba4; # extraConfig = '' # workgroup = WORKGROUP # server role = standalone server