flake: update

This reverts commit 8ef4d1145f.

flake.lock

@@ -35,11 +35,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1747046372,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -48,37 +48,51 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "git-hooks": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "flake-compat": [
+          "simple-nixos-mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1742649964,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "numtide",
+        "owner": "cachix",
-        "repo": "flake-utils",
+        "repo": "git-hooks.nix",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "cachix",
-        "repo": "flake-utils",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
         "type": "github"
       }
     },
@@ -89,16 +103,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1748226808,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -126,33 +140,34 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738574474,
+        "lastModified": 1748162331,
-        "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
+        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-24_11": {
+    "nixpkgs-25_05": {
       "locked": {
-        "lastModified": 1734083684,
+        "lastModified": 1747610100,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nvim": {
@@ -162,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736528609,
+        "lastModified": 1748077877,
-        "narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=",
+        "narHash": "sha256-sxWrjcRygvs7Fz9gxjSm54ul8+NtU29V+PLAPR6ZfY0=",
         "ref": "refs/heads/master",
-        "rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85",
+        "rev": "b23265403c87af272c74cda484a840b0f22306f5",
-        "revCount": 42,
+        "revCount": 43,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -175,28 +190,6 @@
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       }
     },
-    "peerix": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1684706914,
-        "narHash": "sha256-pBlTtsC28e/5MUTe4NWeNNOc/4Kf6EzGQGppQEQ/ioo=",
-        "owner": "asmir.abdulahovic",
-        "repo": "peerix",
-        "rev": "8fdbbd0039240e05b4f93bbd5b454d5643e8a8d1",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "asmir.abdulahovic",
-        "repo": "peerix",
-        "type": "gitlab"
-      }
-    },
     "project-cloud": {
       "inputs": {
         "nixpkgs": [
@@ -225,7 +218,6 @@
         "nix-xilinx": "nix-xilinx",
         "nixpkgs": "nixpkgs",
         "nvim": "nvim",
-        "peerix": "peerix",
         "project-cloud": "project-cloud",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix",
@@ -236,18 +228,19 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
+        "git-hooks": "git-hooks",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-25_05": "nixpkgs-25_05"
       },
       "locked": {
-        "lastModified": 1737736848,
+        "lastModified": 1747965231,
-        "narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=",
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
         "type": "gitlab"
       },
       "original": {
@@ -263,11 +256,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
+        "lastModified": 1747603214,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
         "type": "github"
       },
       "original": {
@@ -296,21 +289,6 @@
         "url": "https://git.project-cloud.net/asmir/swaysw"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "theme_anemone": {
       "flake": false,
       "locked": {

flake.nix

@@ -2,18 +2,13 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     nix-xilinx = {
       url = "gitlab:asmir.abdulahovic/nix-xilinx";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    peerix = {
-      url = "gitlab:asmir.abdulahovic/peerix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     zremap = {
       url = "git+https://git.project-cloud.net/asmir/zremap";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -35,7 +30,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -56,7 +51,6 @@
       nixpkgs,
       nix-xilinx,
       nvim,
-      peerix,
       project-cloud,
       simple-nixos-mailserver,
       sops-nix,
@@ -88,18 +82,6 @@
               home-manager.extraSpecialArgs = { inherit inputs system; };
               home-manager.backupFileExtension = "home_backup";
             }
-            peerix.nixosModules.peerix
-            {
-              services.peerix = {
-                enable = true;
-                globalCacheTTL = 10;
-                package = peerix.packages.x86_64-linux.peerix;
-                openFirewall = true; # UDP/12304
-                privateKeyFile = nixy.config.sops.secrets."peerix/private".path;
-                publicKeyFile = ./nixy/peerix-public;
-                publicKey = "peerix-mediabox:UDgG3xdQYv7bmx2l4ZPNRPJtp2zMmY++H/fnGeJ9BQw=";
-              };
-            }
           ];
         };
 
@@ -122,18 +104,6 @@
               home-manager.users.akill = import ./home/home.nix;
               home-manager.extraSpecialArgs = { inherit inputs system; };
             }
-            peerix.nixosModules.peerix
-            {
-              services.peerix = {
-                enable = true;
-                globalCacheTTL = 10;
-                package = peerix.packages.x86_64-linux.peerix;
-                openFirewall = true; # UDP/12304
-                privateKeyFile = mediabox.config.sops.secrets."peerix/private".path;
-                publicKeyFile = ./mediabox/peerix-public;
-                publicKey = "peerix-nixy:8THqS0R2zWF/47ai0RFmqJnieYTZ1jaWOD9tnzpvA6s=";
-              };
-            }
           ];
         };
 

home/home.nix

@@ -86,7 +86,9 @@ in
         hwdec = "auto";
         vo = "gpu-next";
         ao = "pipewire";
-        script-opts-set = "ytdl_hook-ytdl_path=yt-dlp,sponsorblock-local_database=no,sponsorblock-skip_categories=[sponsor,intro,selfpromo]";
+        osd-bar = "no";
+        border = "no";
+        script-opts-set = "";
         ytdl-format = "bestvideo[height<=?1080]+bestaudio/best";
       };
 
@@ -160,7 +162,6 @@ in
 
     qutebrowser = {
       enable = true;
-      package = qutebrowser_firejail;
       keyBindings = {
         normal = {
           "j" = "scroll-px 0 25";
@@ -251,13 +252,26 @@ in
     swayidle =
       let
         locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
-          TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
+          ALL_IMGS=""
-          ${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
+          LOCK_ARGS=""
-          ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
+          for OUTPUT in $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${lib.getExe pkgs.jq} -r '.[].name')
-          ${pkgs.coreutils}/bin/shred "$TMP_FILE"
+          do
-          ${pkgs.coreutils}/bin/rm "$TMP_FILE"
+            TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
+            ${lib.getExe pkgs.grim} -t ppm -o $OUTPUT - | \
+              ${lib.getExe pkgs.ffmpeg} -y -loglevel 0 -i - -vframes 1 -vf "boxblur=10" "$TMP_FILE"
+            LOCK_ARGS="$LOCK_ARGS --image $OUTPUT:$TMP_FILE"
+            ALL_IMGS="$ALL_IMGS $TMP_FILE"
+          done
+            ${lib.getExe pkgs.swaylock} -f $LOCK_ARGS
+            ${pkgs.coreutils}/bin/shred $ALL_IMGS
+            ${pkgs.coreutils}/bin/rm $ALL_IMGS
         '';
       in
+      /*
+        refresh_i3status = pkgs.writeShellScriptBin "refresh_i3status" ''
+          ${pkgs.coreutils}/bin/sleep 1 && ${pkgs.procps}/bin/pkill -USR1 i3status-rs
+        '';
+      */
       {
         enable = true;
         events = [
@@ -269,10 +283,12 @@ in
             event = "lock";
             command = "${locker}/bin/swaylock_fancy";
           }
-          {
+          /*
-            event = "after-resume";
+            {
-            command = "${pkgs.procps}/bin/pkill -USR1 i3status-rs";
+              event = "after-resume";
-          }
+              command = "${refresh_i3status}/bin/refresh_i3status";
+            }
+          */
         ];
         timeouts = [
           {
@@ -299,17 +315,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} $@
   '';
@@ -58,9 +63,10 @@ in
       cached-nix-shell
       caddy
       cargo
-      ungoogled-chromium
       cmake
       compsize
+      kdePackages.ark
+      ungoogled-chromium
       # cura
       deluge
       dfu-util
@@ -86,7 +92,7 @@ in
       imv
       inkscape
       jellyfin-media-player
-      kdenlive
+      kdePackages.kdenlive
       kicad
       kodi-wayland
       krita
@@ -130,7 +136,6 @@ in
       screen
       seer
       sioyek
-      skypeforlinux
       slurp
       steam-run
       stm32cubemx
@@ -143,6 +148,7 @@ in
       thunderbird
       typst
       upx
+      viber
       waybar
       wdisplays
       weechat
@@ -165,13 +171,13 @@ in
       chromium_discord
       chromium_stackfield
       chromium_teams
+      nixy_switch
+      qcad
       ssh_proxy
       wrap_sh
-      qcad
     ]
     ++ [
       inputs.swaysw.packages.${system}.swaysw
-      (pkgs.callPackage ../packages/viber/default.nix { })
       (pkgs.callPackage ../packages/bubblewrap/default.nix { })
     ];
 }

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;
         }

home/sway.nix

@@ -17,7 +17,6 @@ let
     ${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
   '';
   swaysw = inputs.swaysw.packages.${system}.swaysw;
-  viber = pkgs.callPackage ../packages/viber/default.nix { };
   term = "${pkgs.foot}/bin/footclient";
 in
 {
@@ -146,7 +145,7 @@ in
         "Mod4+j" =
           "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
         "Mod4+h" =
-          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
+          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${pkgs.viber}/bin/viber";
         "Mod4+y" =
           ''exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
         "Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";

home/zsh.nix

@@ -72,7 +72,7 @@
 
     envExtra = '''';
 
-    initExtra = ''
+    initContent = ''
       # binds
       bindkey '^K' fzf-file-widget
 

magpie/configuration.nix

@@ -333,8 +333,8 @@
   };
 
   networking.hostName = "magpie";
+  networking.nftables.enable = true;
   networking.firewall = {
-    nftables.enable = true;
     enable = true;
     allowedTCPPorts = [
       80
@@ -366,13 +366,13 @@
 
       # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
       # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
-      postSetup = ''
+      #postSetup = ''
-        ${pkgs.nftables}/bin/nft add rule ip nat POSTROUTING oifname "eth0" ip saddr 10.100.0.0/24 counter masquerade
+      #  ${pkgs.nftables}/bin/nft add rule ip nat POSTROUTING oifname "eth0" ip saddr 10.100.0.0/24 counter masquerade
-      '';
+      #'';
       # This undoes the above command, TODO fix command below to be more specific
-      postShutdown = ''
+      #postShutdown = ''
-        ${pkgs.nftables}/bin/nft flush table ip nat
+      #  ${pkgs.nftables}/bin/nft flush table ip nat
-      '';
+      #'';
       privateKeyFile = config.sops.secrets."wg_privkey".path;
 
       peers = [

mediabox/configuration.nix

@@ -1,19 +1,22 @@
-# Edit this configuration file to define what should be installed on
+{ config
-# your system.  Help is available in the configuration.nix(5) man page
+, nvim
-# and in the NixOS manual (accessible by running ‘nixos-help’).
+, pkgs
-{
+, system
-  config,
+, zremap
-  pkgs,
+, ...
-  zremap,
-  system,
-  nvim,
-  ...
 }:
+let
+  USER = "akill";
+in
 {
   imports = [ ];
 
   system.stateVersion = "23.05";
   system.autoUpgrade.enable = false;
+  system.switch = {
+    enable = true;
+    enableNg = true;
+  };
 
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
   sops.secrets."peerix/private" = {
@@ -74,29 +77,35 @@
     readOnlyNixStore = true;
     supportedFilesystems = [ "btrfs" ];
     tmp.useTmpfs = true;
-    tmp.tmpfsSize = "80%";
   };
 
   security = {
     rtkit.enable = true;
-    acme = {
+    allowSimultaneousMultithreading = true;
-      acceptTerms = true;
+    sudo.enable = true;
-      defaults.email = "aasmir@gmx.com";
+    doas.enable = true;
-    };
+    doas.extraRules = [
+      {
+        users = [ USER ];
+        keepEnv = true;
+        persist = true;
+      }
+    ];
   };
 
   powerManagement = {
     enable = true;
-    cpuFreqGovernor = "ondemand";
   };
 
   networking = {
+    nftables.enable = true;
     firewall = {
       enable = true;
       allowedTCPPorts = [
         80
         443
         51820
+        8020
       ];
     };
 
@@ -111,14 +120,16 @@
       "::1"
     ];
     dhcpcd.extraConfig = "nohook resolv.conf";
-    networkmanager.dns = "none";
+
     extraHosts = ''
       192.168.1.173 nixy.lan
       192.168.88.171 jellyfin.mediabox.lan
+      192.168.88.171 jellyseerr.mediabox.lan
       192.168.88.171 mediabox.lan
       192.168.88.171 qbittorrent.mediabox.lan
       192.168.88.1   router.lan
       192.168.88.231 workstation.lan
+      192.168.88.121 ender.lan
     '';
 
     wireguard.interfaces = {
@@ -149,44 +160,47 @@
     };
   };
 
-  programs.gnupg.agent = {
+  programs = {
-    enable = true;
+    steam = {
-    enableSSHSupport = true;
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = false;
+      localNetworkGameTransfers.openFirewall = true;
+    };
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+    appimage = {
+      enable = true;
+      binfmt = true;
+    };
+    nix-ld = {
+      enable = false;
+      libraries = with pkgs; [
+        stdenv.cc.cc.lib
+        zlib
+      ];
+    };
+    zsh.enable = true;
+    firejail.enable = true;
   };
-  programs.zsh.enable = true;
-  programs.light.enable = true;
-  programs.firejail.enable = true;
-  programs.adb.enable = false;
-  programs.wireshark.enable = true;
-  programs.sway.enable = true;
 
   # List services that you want to enable:
   systemd = {
     services = {
-      "macchanger-wireless" = {
+      "zremap@" = {
-        after = [ "sys-subsystem-net-devices-wlp3s0.device" ];
+        enable = true;
-        before = [ "network-pre.target" ];
+        restartIfChanged = true;
-        bindsTo = [ "sys-subsystem-net-devices-wlp3s0.device" ];
-        description = "Changes MAC of my wireless interface for privacy reasons";
-        stopIfChanged = false;
-        wantedBy = [ "multi-user.target" ];
-        wants = [ "network-pre.target" ];
-        script = ''
-          ${pkgs.macchanger}/bin/macchanger -e wlp3s0 || true
-        '';
-        serviceConfig.Type = "oneshot";
-      };
-
-      "zremap" = {
-        description = "Intercepts keyboard udev events";
-        wants = [ "systemd-udevd.service" ];
-        wantedBy = [ "multi-user.target" ];
         serviceConfig.Nice = -20;
-        script = ''
+        unitConfig = {
-          sleep 1
+          Description = "zremap on %I";
-          ${zremap.defaultPackage.${system}}/bin/zremap \
+          ConditionPathExists = "%I";
-          /dev/input/by-path/platform-i8042-serio-0-event-kbd
+        };
-        '';
+        serviceConfig = {
+          Type = "simple";
+          ExecStart = "${zremap.defaultPackage.${system}}/bin/zremap %I";
+        };
       };
 
       "wakeonlan" = {
@@ -202,27 +216,21 @@
           "shutdown.target"
         ];
       };
-
-      /*
-        "cpu_setting" = {
-          description = "Enable turboot boost and undervolt cpu after suspend";
-          wantedBy = ["post-resume.target" "multi-user.target"];
-          after = ["post-resume.target"];
-          script = ''
-                   echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo
-                   echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo
-            ${pkgs.undervolt}/bin/undervolt --core -105 --cache -105 --uncore -105 --gpu -15 -p1 47 28 -p2 57 0.0025
-          '';
-          serviceConfig.Type = "oneshot";
-        };
-      */
     };
+
+    coredump.enable = false;
+    extraConfig = ''
+      DefaultTimeoutStartSec=30s
+      DefaultTimeoutStopSec=30s
+    '';
   };
 
   services = {
     acpid.enable = true;
     btrfs.autoScrub.enable = true;
     dbus.enable = true;
+    dbus.implementation = "broker";
+    envfs.enable = true;
     fstrim.enable = true;
     fwupd.enable = true;
     ntp.enable = true;
@@ -240,13 +248,13 @@
     };
 
     jellyfin = {
-      enable = true;
+      enable = false;
       user = "akill";
       openFirewall = true;
     };
 
     jellyseerr = {
-      enable = true;
+      enable = false;
       openFirewall = true;
     };
 
@@ -257,144 +265,95 @@
       pulse.enable = true;
     };
 
-    deluge = {
+    avahi = {
       enable = false;
-      user = "akill";
+      nssmdns4 = false;
       openFirewall = true;
-      dataDir = "/home/akill/.config/deluge";
-      web = {
-        enable = true;
-        openFirewall = false;
-      };
-      config = {
-        download_location = "/media";
-        allow_remote = true;
-        daemon_port = 58846;
-      };
     };
 
-    transmission = {
+    libinput.enable = true;
-      enable = false;
-      openFirewall = true;
-      settings = {
-        rpc-whitelist = "192.168.88.*";
-        download-dir = "/media";
-      };
-    };
-
-    qbittorrent = {
-      enable = true;
-      user = "akill";
-      openFirewall = true;
-      dataDir = "/home/akill/.config/qbittorrent";
-      port = 8081;
-    };
-
-    nginx = {
-      enable = true;
-      recommendedGzipSettings = true;
-      recommendedOptimisation = true;
-      recommendedProxySettings = true;
-      recommendedTlsSettings = true;
-
-      virtualHosts."deluge.mediabox.lan" = {
-        locations."/".proxyPass = "http://localhost:8112/";
-      };
-      virtualHosts."qbittorrent.mediabox.lan" = {
-        locations."/".proxyPass = "http://localhost:8081/";
-      };
-      virtualHosts."jellyfin.mediabox.lan" = {
-        locations."/".proxyPass = "http://localhost:8096/";
-      };
-      virtualHosts."jellyseerr.mediabox.lan" = {
-        locations."/".proxyPass = "http://localhost:5055/";
-      };
-    };
-
-    journald.extraConfig = ''
-      SystemMaxUse=50M
-    '';
-
-    logind.extraConfig = ''
-      KillUserProcesses=yes
-    '';
-
     xserver = {
       enable = true;
-      libinput.enable = true;
+      dpi = 144;
       desktopManager.xterm.enable = false;
-      displayManager.lightdm.enable = false;
+      desktopManager.plasma5.bigscreen.enable = true;
-      displayManager.defaultSession = "none+icewm";
+      #desktopManager.plasma6.enable = true;
-      windowManager.icewm.enable = true;
+      displayManager = {
+        lightdm.enable = false;
+        startx.enable = true;
+        sddm.enable = true;
+        sddm.wayland.enable = true;
+      };
+      windowManager.i3.enable = false;
     };
 
-    udev.packages = [ ];
+    udev = {
+      packages = [ ];
+      extraRules = ''
+        #zremap on new keyboard
+        ACTION=="add", SUBSYSTEM=="input", ATTRS{phys}!="", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", ENV{ID_INPUT_KEYBOARD}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="zremap@$env{DEVNAME}.service"
+      '';
+    };
 
     tlp = {
-      enable = true;
+      enable = false;
-      settings = { };
+    };
+
+    batteryNotifier = {
+      enable = false;
+      notifyCapacity = 20;
+      suspendCapacity = 10;
     };
 
     actkbd = {
       enable = true;
       bindings = [
         {
-          keys = [ 121 ];
+          keys = [ 115 ];
           events = [ "key" ];
-          command = "${pkgs.alsaUtils}/bin/amixer -q set Master toggle";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
         }
+
         {
-          keys = [ 122 ];
+          keys = [ 114 ];
           events = [
             "key"
             "rep"
           ];
-          command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
         }
+
         {
-          keys = [ 123 ];
+          keys = [ 113 ];
           events = [
             "key"
             "rep"
           ];
-          command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute";
+          command = "XDG_RUNTIME_DIR=/run/user/$(id -u ${USER}) ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
         }
+
         {
           keys = [ 224 ];
           events = [ "key" ];
-          command = "/run/current-system/sw/bin/light -U 5";
+          command = "${pkgs.light}/bin/light -U 5";
         }
+
         {
           keys = [ 225 ];
           events = [ "key" ];
-          command = "/run/current-system/sw/bin/light -A 5";
+          command = "${pkgs.light}/bin/light -A 5";
         }
       ];
     };
 
-    mpd = {
-      musicDirectory = "/home/mpd/music";
-      enable = false;
-      extraConfig = ''
-        audio_output {
-          type "pulse"
-          name "pulsee srv"
-          server "127.0.0.1"
-        }
-      '';
-    };
-
-    batteryNotifier = {
-      enable = true;
-      notifyCapacity = 20;
-      suspendCapacity = 10;
-    };
-
     dnscrypt-proxy2 = {
       enable = true;
       settings = {
         ipv6_servers = true;
         require_dnssec = true;
+        require_nolog = true;
+        require_nofilter = true;
+        http3 = true;
 
         sources.public-resolvers = {
           urls = [
@@ -406,33 +365,62 @@
         };
       };
     };
+
+    journald.extraConfig = ''
+      SystemMaxUse=50M
+    '';
+
+    logind.extraConfig = ''
+      KillUserProcesses=yes
+    '';
+
   };
 
-  fonts.packages = with pkgs; [
+  fonts = {
-    dina-font
+    fontconfig = {
-    fira-code
+      cache32Bit = true;
-    fira-code-symbols
+      allowBitmaps = true;
-    font-awesome
+      useEmbeddedBitmaps = true;
-    font-awesome_4
+      defaultFonts = {
-    iosevka
+        monospace = [ "JetBrainsMono" ];
-    jetbrains-mono
+      };
-    liberation_ttf
+    };
-    proggyfonts
+
-    siji
+    packages = with pkgs; [
-  ];
+      dejavu_fonts
+      dina-font
+      fira-code
+      fira-code-symbols
+      font-awesome_6
+      inconsolata
+      iosevka
+      jetbrains-mono
+      liberation_ttf
+      libertine
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-color-emoji
+      noto-fonts-emoji
+      proggyfonts
+      siji
+      terminus_font
+      terminus_font_ttf
+      ubuntu_font_family
+      vistafonts
+    ];
+  };
 
   virtualisation = {
     podman = {
-      enable = true;
+      enable = false;
+      autoPrune.enable = true;
       dockerCompat = true;
     };
   };
 
-  sound.enable = true;
-
   hardware = {
     bluetooth = {
-      enable = false;
+      enable = true;
       settings = {
         General = {
           Enable = "Source,Sink,Media,Socket";
@@ -440,14 +428,9 @@
       };
     };
 
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport = true;
+      extraPackages = [ ];
-      driSupport32Bit = true;
-      extraPackages = with pkgs; [
-        intel-media-driver
-        vaapiIntel
-      ];
     };
   };
 
@@ -456,18 +439,14 @@
     algorithm = "zstd";
   };
 
-  users.users.akill = {
+  users.users.${USER} = {
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [
-      "wireshark"
       "wheel"
-      "kvm"
       "tty"
       "audio"
       "sound"
-      "adbusers"
-      "transmission"
     ];
     openssh.authorizedKeys.keys = [
       (builtins.readFile ../nixy/ssh_pubkey)
@@ -478,14 +457,10 @@
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [
-      "wireshark"
       "wheel"
-      "kvm"
       "tty"
       "audio"
       "sound"
-      "adbusers"
-      "transmission"
     ];
   };
 

nixy/configuration.nix

@@ -1,11 +1,10 @@
-{
+{ config
-  config,
+, nix-xilinx
-  nix-xilinx,
+, nvim
-  nvim,
+, pkgs
-  pkgs,
+, system
-  system,
+, zremap
-  zremap,
+, ...
-  ...
 }:
 let
   USER = "akill";
@@ -16,7 +15,7 @@ in
   system.stateVersion = "23.05";
   system.autoUpgrade.enable = false;
   system.switch = {
-    enable = false;
+    enable = true;
     enableNg = true;
   };
 
@@ -88,7 +87,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 +235,13 @@ in
       enable = true;
       binfmt = true;
     };
+    nix-ld = {
+      enable = false;
+      libraries = with pkgs; [
+        stdenv.cc.cc.lib
+        zlib
+      ];
+    };
     zsh.enable = true;
     firejail.enable = true;
     adb.enable = true;
@@ -248,6 +254,14 @@ in
   # List services that you want to enable:
   systemd = {
     services = {
+
+      # Fix issue where systemd-vconsole-setup failes to find keymap
+      systemd-vconsole-setup = {
+        unitConfig = {
+          After = "local-fs.target";
+        };
+      };
+
       "zremap@" = {
         enable = true;
         restartIfChanged = true;
@@ -372,6 +386,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 +453,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 +464,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 +606,7 @@ in
   };
 
   virtualisation = {
+    waydroid.enable = false;
     libvirtd = {
       enable = true;
       allowedBridges = [