home/kanshi: fix monitor positions -- needed for wine bug

flake.lock

@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738574474,
-        "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
+        "lastModified": 1741445498,
+        "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
+        "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1737736848,
-        "narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=",
+        "lastModified": 1740437053,
+        "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261",
+        "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
         "type": "gitlab"
       },
       "original": {
@@ -263,11 +263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "lastModified": 1741043164,
+        "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
         "type": "github"
       },
       "original": {

home/home.nix

@@ -86,6 +86,8 @@ in
         hwdec = "auto";
         vo = "gpu-next";
         ao = "pipewire";
+        osd-bar = "no";
+        border = "no";
         script-opts-set = "ytdl_hook-ytdl_path=yt-dlp,sponsorblock-local_database=no,sponsorblock-skip_categories=[sponsor,intro,selfpromo]";
         ytdl-format = "bestvideo[height<=?1080]+bestaudio/best";
       };
@@ -257,6 +259,11 @@ in
           ${pkgs.coreutils}/bin/shred "$TMP_FILE"
           ${pkgs.coreutils}/bin/rm "$TMP_FILE"
         '';
+	/*
+        refresh_i3status = pkgs.writeShellScriptBin "refresh_i3status" ''
+          ${pkgs.coreutils}/bin/sleep 1 && ${pkgs.procps}/bin/pkill -USR1 i3status-rs
+        '';
+	*/
       in
       {
         enable = true;
@@ -269,10 +276,12 @@ in
             event = "lock";
             command = "${locker}/bin/swaylock_fancy";
           }
+	  /*
           {
             event = "after-resume";
-            command = "${pkgs.procps}/bin/pkill -USR1 i3status-rs";
+            command = "${refresh_i3status}/bin/refresh_i3status";
           }
+	  */
         ];
         timeouts = [
           {
@@ -299,17 +308,17 @@ in
           profile.outputs = [
             {
               criteria = "eDP-1";
-              position = "3840,0";
+              position = "0,0";
             }
             {
               criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026536";
               mode = "1920x1080@74.973Hz";
-              position = "5760,0";
+              position = "1920,0";
             }
             {
               criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026535";
               mode = "1920x1080@74.973Hz";
-              position = "7680,0";
+              position = "3840,0";
             }
           ];
         }

home/home_packages.nix

@@ -15,6 +15,11 @@ let
   chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
     ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
   '';
+  nixy_switch = pkgs.writeShellScriptBin "nixy_switch" ''
+    ${pkgs.util-linux}/bin/ionice -c 3 -- \
+    ${pkgs.coreutils}/bin/nice -n 20 -- \
+    ${lib.getExe pkgs.nixos-rebuild} --flake ./#nixy switch
+  '';
   qcad = pkgs.writeShellScriptBin "qcad" ''
     QT_QPA_PLATFORM=xcb ${lib.getExe pkgs.qcad} $@
   '';
@@ -50,6 +55,7 @@ in
     [
       anydesk
       appimage-run
+      ark
       arp-scan
       birdtray
       blackmagic
@@ -130,7 +136,6 @@ in
       screen
       seer
       sioyek
-      skypeforlinux
       slurp
       steam-run
       stm32cubemx
@@ -165,9 +170,10 @@ in
       chromium_discord
       chromium_stackfield
       chromium_teams
+      nixy_switch
+      qcad
       ssh_proxy
       wrap_sh
-      qcad
     ]
     ++ [
       inputs.swaysw.packages.${system}.swaysw

home/i3status-rust.nix

@@ -1,4 +1,14 @@
-{ ... }:
+{ pkgs, ... }:
+let
+  kbd_switch = pkgs.writeShellScriptBin "kbd_switch" ''
+    declare -A -r KBD_CYCLE_MAP=(
+      ["English (US)"]="de"
+      ["German"]="ba"
+    )
+    LAYOUT="$(${pkgs.sway}/bin/swaymsg -t get_inputs -r | ${pkgs.jq}/bin/jq -r 'map(select(.type == "keyboard")).[0].xkb_layout_names.[]')"
+    swaymsg input "*" xkb_layout ''${KBD_CYCLE_MAP["$LAYOUT"]:-"us"}
+  '';
+in
 {
   programs.i3status-rust = {
     bars.top = {
@@ -12,6 +22,16 @@
       };
 
       blocks = [
+        {
+          block = "keyboard_layout";
+          driver = "sway";
+          click = [
+            {
+              cmd = "${kbd_switch}/bin/kbd_switch";
+              button = "left";
+            }
+          ];
+        }
         {
           block = "battery";
           interval = 10;
@@ -36,20 +56,30 @@
         {
           block = "net";
           device = "wlan0";
+          if_command = "ip link show wlan0";
           interval = 2;
         }
         {
           block = "net";
           device = "enp5s0";
+          if_command = "ip link show enp5s0";
           interval = 2;
         }
         {
           block = "net";
           device = "enp7s0f3u1u1";
+          if_command = "ip link show enp7s0f3u1u1";
           interval = 2;
         }
         {
           block = "net";
+          device = "enp7s0f4u1u1";
+          if_command = "ip link show enp7s0f4u1u1";
+          interval = 2;
+        }
+        {
+          block = "net";
+          if_command = "ip link show eno1";
           device = "eno1";
           interval = 2;
         }

magpie/configuration.nix

@@ -333,8 +333,8 @@
   };
 
   networking.hostName = "magpie";
+  networking.nftables.enable = true;
   networking.firewall = {
-    nftables.enable = true;
     enable = true;
     allowedTCPPorts = [
       80

nixy/configuration.nix

@@ -88,7 +88,7 @@ in
       "psmouse.synaptics_intertouch=0"
       "mem_sleep_default=deep"
     ];
-    kernelPackages = pkgs.linuxPackages_latest;
+    #kernelPackages = pkgs.linuxPackages_latest;
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
@@ -236,6 +236,13 @@ in
       enable = true;
       binfmt = true;
     };
+    nix-ld = {
+      enable = true;
+      libraries = with pkgs; [
+        stdenv.cc.cc.lib
+        zlib
+      ];
+    };
     zsh.enable = true;
     firejail.enable = true;
     adb.enable = true;
@@ -372,6 +379,7 @@ in
     acpid.enable = true;
     dbus.enable = true;
     dbus.implementation = "broker";
+    envfs.enable = true;
     fstrim.enable = true;
     fwupd.enable = true;
     ntp.enable = true;
@@ -438,9 +446,9 @@ in
       enable = true;
       bindings = [
         {
-          keys = [ 113 ];
+          keys = [ 115 ];
           events = [ "key" ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
         }
 
         {
@@ -449,16 +457,16 @@ in
             "key"
             "rep"
           ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
         }
 
         {
-          keys = [ 115 ];
+          keys = [ 113 ];
           events = [
             "key"
             "rep"
           ];
-          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
         }
 
         {
@@ -591,6 +599,7 @@ in
   };
 
   virtualisation = {
+    waydroid.enable = false;
     libvirtd = {
       enable = true;
       allowedBridges = [