magpie/networking: iptables -> nftables

This reverts commit 350bcfed05.

blue/configuration.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   imports = [
   ];
 
@@ -14,7 +15,10 @@
     gc.automatic = true;
     gc.options = "--delete-older-than 7d";
     package = pkgs.nixVersions.latest;
-    settings.experimental-features = ["nix-command" "flakes"];
+    settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
   };
 
   boot = {
@@ -53,15 +57,16 @@
   networking = {
     firewall.enable = true;
     hostName = "blue";
-    nameservers = ["127.0.0.1" "::1"];
+    nameservers = [
+      "127.0.0.1"
+      "::1"
+    ];
     dhcpcd.extraConfig = "nohook resolv.conf";
 
     networkmanager = {
       enable = true;
       dns = "none";
-      /*
+      # wifi.backend = "iwd";
-      wifi.backend = "iwd";
-      */
     };
   };
 
@@ -152,7 +157,10 @@
       windowManager.i3.enable = true;
     };
 
-    udev.packages = [pkgs.rtl-sdr pkgs.openhantek6022];
+    udev.packages = [
+      pkgs.rtl-sdr
+      pkgs.openhantek6022
+    ];
 
     tlp = {
       enable = true;
@@ -169,13 +177,19 @@
 
         {
           keys = [ 114 ];
-          events = ["key" "rep"];
+          events = [
+            "key"
+            "rep"
+          ];
           command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
         }
 
         {
           keys = [ 115 ];
-          events = ["key" "rep"];
+          events = [
+            "key"
+            "rep"
+          ];
           command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
         }
 
@@ -306,6 +320,14 @@
   users.users.akill = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout"];
+    extraGroups = [
+      "wireshark"
+      "kvm"
+      "tty"
+      "audio"
+      "sound"
+      "adbusers"
+      "dialout"
+    ];
   };
 }

blue/hardware-configuration.nix

@@ -6,12 +6,21 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -19,34 +28,55 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = ["subvol=root" "compress=zstd" "noatime"];
+    options = [
+      "subvol=root"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
-  boot.initrd.luks.devices."enc_root".device = "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
+  boot.initrd.luks.devices."enc_root".device =
+    "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
 
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = ["subvol=home" "compress=zstd" "noatime"];
+    options = [
+      "subvol=home"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = ["subvol=nix" "compress=zstd" "noatime"];
+    options = [
+      "subvol=nix"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/var/log" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = ["subvol=log" "compress=zstd" "noatime"];
+    options = [
+      "subvol=log"
+      "compress=zstd"
+      "noatime"
+    ];
     neededForBoot = true;
   };
 
   fileSystems."/persist" = {
     device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
     fsType = "btrfs";
-    options = ["subvol=persist" "compress=zstd" "noatime"];
+    options = [
+      "subvol=persist"
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   fileSystems."/boot" = {

common/packages.nix

@@ -3,10 +3,13 @@
   nix-xilinx,
   system,
   ...
-}: {
+}:
-  environment.systemPackages = with pkgs;
+{
+  environment.systemPackages =
+    with pkgs;
     [
       acpi
+      aria2
       binutils
       binwalk
       bluez
@@ -21,6 +24,7 @@
       dnsmasq
       dnsutils
       dtach
+      ethtool
       f2fs-tools
       fd
       file
@@ -28,6 +32,8 @@
       fzf
       fzy
       git
+      adwaita-icon-theme
+      gnomeExtensions.appindicator
       gnupg
       gptfdisk
       hcxdumptool
@@ -89,5 +95,11 @@
       zip
       z-lua
     ]
-    ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
+    ++ (with nix-xilinx.packages.${system}; [
+      vivado
+      vitis
+      vitis_hls
+      model_composer
+      xilinx-shell
+    ]);
 }

common/suspend.nix

@@ -4,9 +4,11 @@
   pkgs,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.services.batteryNotifier;
-in {
+in
+{
   options = {
     services.batteryNotifier = {
       enable = mkOption {

flake.lock

@@ -19,11 +19,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1732722421,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
         "type": "github"
       },
       "original": {
@@ -33,22 +33,6 @@
       }
     },
     "flake-compat_2": {
-      "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-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -64,7 +48,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -80,39 +64,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1692742795,
-        "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -131,30 +82,6 @@
         "type": "github"
       }
     },
-    "goatcounter": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1705880453,
-        "narHash": "sha256-Y1O6tia2Pc1MA5ZoFH3B2y7FwjZuIDiNT4C9+bBawrY=",
-        "owner": "asmir-abdulahovic",
-        "repo": "goatcounter-flake",
-        "rev": "f912ab7024cbc47d5fa80a416b643707a9b50b06",
-        "type": "github"
-      },
-      "original": {
-        "owner": "asmir-abdulahovic",
-        "repo": "goatcounter-flake",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -162,32 +89,33 @@
         ]
       },
       "locked": {
-        "lastModified": 1721135958,
+        "lastModified": 1736373539,
-        "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nix-xilinx": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1699035130,
+        "lastModified": 1732892167,
-        "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=",
+        "narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=",
         "owner": "asmir.abdulahovic",
         "repo": "nix-xilinx",
-        "rev": "0323990db46c32e361e4fd70600d859eb90862af",
+        "rev": "3071f40914fe2db3837a40a72a97af6f0a442f16",
         "type": "gitlab"
       },
       "original": {
@@ -198,69 +126,35 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721379653,
+        "lastModified": 1738574474,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-24_05": {
+    "nixpkgs-24_11": {
       "locked": {
-        "lastModified": 1717144377,
+        "lastModified": 1734083684,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1720915306,
-        "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nvim": {
       "inputs": {
         "nixpkgs": [
@@ -268,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718784775,
+        "lastModified": 1736528609,
-        "narHash": "sha256-tKanhhqgHdMBWS8KZ+ZYsefrQ8ipVn8NbXlSciaNc+c=",
+        "narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=",
         "ref": "refs/heads/master",
-        "rev": "e3c064d3a995fe81731c8df7664d48b1106a707b",
+        "rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85",
-        "revCount": 33,
+        "revCount": 42,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -283,7 +177,7 @@
     },
     "peerix": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
@@ -312,11 +206,11 @@
         "theme_deepthought": "theme_deepthought"
       },
       "locked": {
-        "lastModified": 1705870326,
+        "lastModified": 1729077289,
-        "narHash": "sha256-ojdGSeqztnnGMyLKjnSCGq0muGh3U+Zb9iwzaaDsaF4=",
+        "narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=",
         "ref": "refs/heads/master",
-        "rev": "ad6af66a6142279789db8967b285eb04c6d18c02",
+        "rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d",
-        "revCount": 26,
+        "revCount": 27,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/project-cloud"
       },
@@ -327,7 +221,6 @@
     },
     "root": {
       "inputs": {
-        "goatcounter": "goatcounter",
         "home-manager": "home-manager",
         "nix-xilinx": "nix-xilinx",
         "nixpkgs": "nixpkgs",
@@ -343,18 +236,18 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_05": "nixpkgs-24_05"
+        "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1718697807,
+        "lastModified": 1737736848,
-        "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=",
+        "narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b",
+        "rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261",
         "type": "gitlab"
       },
       "original": {
@@ -367,15 +260,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1720926522,
+        "lastModified": 1738291974,
-        "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
+        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
+        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
         "type": "github"
       },
       "original": {
@@ -451,27 +343,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "goatcounter",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1702461037,
-        "narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "d06b70e5163a903f19009c3f97770014787a080f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "zremap": {
       "inputs": {
         "nixpkgs": [
@@ -479,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721120316,
+        "lastModified": 1737802495,
-        "narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
+        "narHash": "sha256-Q+bZnH7uQM5T/G+xCGSRU3bTJqD70NeE4vLXLXLCm7k=",
         "ref": "refs/heads/master",
-        "rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
+        "rev": "4962f12867b0b6c4c4d39b98e6016e7f925a802c",
-        "revCount": 21,
+        "revCount": 23,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/zremap"
       },

flake.nix

@@ -2,7 +2,7 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
 
     nix-xilinx = {
       url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -34,13 +34,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    goatcounter = {
-      url = "github:asmir-abdulahovic/goatcounter-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -55,8 +50,8 @@
     };
   };
 
-  outputs = inputs @ {
+  outputs =
-    goatcounter,
+    inputs@{
       home-manager,
       nixpkgs,
       nix-xilinx,
@@ -68,9 +63,11 @@
       swaysw,
       zremap,
       ...
-  }: let
+    }:
+    let
       pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
-  in {
+    in
+    {
       nixosConfigurations = rec {
         nixy = nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
@@ -89,6 +86,7 @@
               home-manager.useUserPackages = true;
               home-manager.users.akill = import ./home/home.nix;
               home-manager.extraSpecialArgs = { inherit inputs system; };
+              home-manager.backupFileExtension = "home_backup";
             }
             peerix.nixosModules.peerix
             {
@@ -157,6 +155,7 @@
             }
           ];
         };
+
         magpie = nixpkgs.lib.nixosSystem rec {
           system = "aarch64-linux";
           modules = [
@@ -165,7 +164,6 @@
             { nix.registry.nixpkgs.flake = nixpkgs; }
             ./magpie/configuration.nix
             ./magpie/hardware-configuration.nix
-          goatcounter.nixosModules.goatcounter
             simple-nixos-mailserver.nixosModule
             sops-nix.nixosModules.sops
             (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")
@@ -174,7 +172,11 @@
       };
 
       devShell.x86_64-linux = pkgs.mkShell {
-      buildInputs = with pkgs; [sops ssh-to-age age];
+        buildInputs = with pkgs; [
+          sops
+          ssh-to-age
+          age
+        ];
         shellHook = ''
           echo "Configuring NixOS!"
         '';

home/home.nix

@@ -2,12 +2,21 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
     firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
   '';
-in {
+in
-  imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
+{
+  imports = [
+    ./zsh.nix
+    ./i3status-rust.nix
+    ./sway.nix
+    ./i3.nix
+    ./home_packages.nix
+    ./whatsapp-for-linux.nix
+  ];
 
   home.stateVersion = "22.11";
   home.username = "akill";
@@ -35,12 +44,15 @@ in {
     EDITOR = "nvim";
     _JAVA_AWT_WM_NONREPARENTING = "1";
     MOZ_ENABLE_WAYLAND = "1";
+    NIXOS_OZONE_WL = "1";
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
     SUDO_EDITOR = "nvim";
     WLR_RENDERER = "vulkan";
   };
 
-  wayland.windowManager.sway = {enable = true;};
+  wayland.windowManager.sway = {
+    enable = true;
+  };
 
   programs = {
     home-manager.enable = true;
@@ -59,7 +71,11 @@ in {
       clock24 = true;
       keyMode = "vi";
       terminal = "screen-256color";
-      plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox];
+      plugins = with pkgs.tmuxPlugins; [
+        sysstat
+        net-speed
+        gruvbox
+      ];
     };
 
     mpv = {
@@ -136,7 +152,9 @@ in {
           font = "JetBrainsMono:size=10";
           dpi-aware = "yes";
         };
-        mouse = {hide-when-typing = "yes";};
+        mouse = {
+          hide-when-typing = "yes";
+        };
       };
     };
 
@@ -181,8 +199,13 @@ in {
       userName = "Asmir A";
       userEmail = "asmir.abdulahovic@gmail.com";
       extraConfig = {
-        pull = {rebase = true;};
+        init.defaultBranch = "master";
-        credential = {helper = "store";};
+        pull = {
+          rebase = true;
+        };
+        credential = {
+          helper = "store";
+        };
       };
       signing.key = "020C42B7A9ABA3E2";
       signing.signByDefault = true;
@@ -190,7 +213,14 @@ in {
 
     obs-studio = {
       enable = true;
-      plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-vkcapture
+        input-overlay
+        obs-multi-rtmp
+        obs-pipewire-audio-capture
+        wlrobs
+        obs-vaapi
+      ];
     };
 
     i3status-rust.enable = true;
@@ -218,14 +248,17 @@ in {
       enableSshSupport = true;
     };
 
-    swayidle = let
+    swayidle =
+      let
         locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
           TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
           ${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
           ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
+          ${pkgs.coreutils}/bin/shred "$TMP_FILE"
           ${pkgs.coreutils}/bin/rm "$TMP_FILE"
         '';
-    in {
+      in
+      {
         enable = true;
         events = [
           {
@@ -266,14 +299,17 @@ in {
           profile.outputs = [
             {
               criteria = "eDP-1";
+              position = "3840,0";
             }
             {
               criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026536";
               mode = "1920x1080@74.973Hz";
+              position = "5760,0";
             }
             {
               criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026535";
               mode = "1920x1080@74.973Hz";
+              position = "7680,0";
             }
           ];
         }
@@ -283,19 +319,17 @@ in {
 
   systemd.user = {
     services = {
-      /*
+      wayland-pipewire-idle-inhibit = {
-       himalaya = {
+        Unit.Description = "inhibit sleep while audio output is active";
-      Unit.Description = "Himalaya new messages notifier";
         Service = {
-      ExecStart = "himalaya notify";
+          ExecStart = "${lib.getExe pkgs.wayland-pipewire-idle-inhibit}";
           Restart = "always";
           RestartSec = 10;
         };
         Install = {
-      WantedBy = [ "multi-user.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
       };
-      */
     };
   };
 }

home/home_packages.nix

@@ -4,15 +4,19 @@
   inputs,
   system,
   ...
-}: let
+}:
+let
   chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
-    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
   '';
   chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
-    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
   '';
   chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
-    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+  '';
+  qcad = pkgs.writeShellScriptBin "qcad" ''
+    QT_QPA_PLATFORM=xcb ${lib.getExe pkgs.qcad} $@
   '';
   ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
     if ${pkgs.coreutils}/bin/test $# -ne 1; then
@@ -22,7 +26,8 @@
     PROXY_PORT="1337"
     ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
   '';
-  wrap_sh = let
+  wrap_sh =
+    let
       bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix { };
     in
     pkgs.writeShellScriptBin "wrap.sh" ''
@@ -38,8 +43,10 @@
         --tmp-overlay "$FULL_PATH" \
         "$SHELL"
     '';
-in {
+in
-  home.packages = with pkgs;
+{
+  home.packages =
+    with pkgs;
     [
       anydesk
       appimage-run
@@ -51,13 +58,16 @@ in {
       cached-nix-shell
       caddy
       cargo
-      chromium
+      ungoogled-chromium
       cmake
       compsize
-      cura
+      # cura
       deluge
+      dfu-util
       discord
       dmenu-wayland
+      drawio
+      dualsensectl
       ffmpeg-full
       firefox
       freecad
@@ -69,7 +79,9 @@ in {
       gnumake
       go
       grim
+      heimdall
       hyperfine
+      icestorm
       imagemagick
       imv
       inkscape
@@ -79,34 +91,42 @@ in {
       kodi-wayland
       krita
       libnotify
-      libreoffice
+      libreoffice-qt6-fresh
       libva-utils
+      linuxPackages_latest.perf
       lsix
       lsix
       mediainfo
       ncdu
       neovide
+      nextpnr
       ngspice
       nix-init
       nixpkgs-fmt
       nix-prefetch-git
       nodePackages.peerflix
       nom
+      openems
       openocd
       openscad
       pandoc
+      paraview
       pass-wayland
       patchelf
       pavucontrol
+      pay-respects
       pirate-get
       poppler_utils
       powertop
       pulsemixer
+      pwvucontrol
       python3
       python3Packages.west
       remmina
       river
+      rizin
       rtorrent
+      sbcl
       screen
       seer
       sioyek
@@ -114,13 +134,18 @@ in {
       slurp
       steam-run
       stm32cubemx
+      swayimg
       tea
       teams-for-linux
+      tectonic
+      tessen
       texlive.combined.scheme-full
       thunderbird
+      typst
       upx
       waybar
       wdisplays
+      weechat
       whatsapp-for-linux
       wine
       wireshark
@@ -129,10 +154,11 @@ in {
       wofi
       x2goclient
       yewtube
+      yosys
       yt-dlp
       zapzap
       zathura
-      zeal-qt6
+      # zeal-qt6
       zig
     ]
     ++ [
@@ -141,6 +167,7 @@ in {
       chromium_teams
       ssh_proxy
       wrap_sh
+      qcad
     ]
     ++ [
       inputs.swaysw.packages.${system}.swaysw

home/i3.nix

@@ -2,9 +2,11 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show";
-in {
+in
+{
   xsession.windowManager.i3 = {
     enable = true;
     package = pkgs.i3;
@@ -53,24 +55,28 @@ in {
         "${modifier}+Escape" = "workspace back_and_forth";
         "${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
 
-        "Mod4+l" = "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
+        "Mod4+l" =
+          "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
         "Mod4+j" = "exec i3-msg [class=\"ViberPC\"] scratchpad show || exec viber";
         "Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird";
-        "Mod4+y" = "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
+        "Mod4+y" =
+          "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
       };
 
       window = {
-        /*
+        # border = 4;
-        border = 4;
-        */
         commands = [
           {
             command = scratchpad_cmd;
-            criteria = {instance = "pulsemixer_scr|python3_scr";};
+            criteria = {
+              instance = "pulsemixer_scr|python3_scr";
+            };
           }
           {
             command = scratchpad_cmd;
-            criteria = {class = "Thunderbird";};
+            criteria = {
+              class = "Thunderbird";
+            };
           }
           {
             command = scratchpad_cmd;
@@ -81,7 +87,9 @@ in {
           }
           {
             command = "focus child, layout tabbed, focus";
-            criteria = {class = "qutebrowser";};
+            criteria = {
+              class = "qutebrowser";
+            };
           }
         ];
       };
@@ -90,7 +98,10 @@ in {
         {
           position = "top";
           fonts = {
-            names = ["DejaVu Sans Mono" "FontAwesome5Free"];
+            names = [
+              "DejaVu Sans Mono"
+              "FontAwesome5Free"
+            ];
             style = "Fixed Bold SemiCondensed";
             size = 7.0;
           };

home/i3status-rust.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.i3status-rust = {
     bars.top = {
       icons = "awesome5";

home/sway.nix

@@ -1,27 +1,30 @@
 {
-  config,
   pkgs,
   inputs,
   system,
+  lib,
   ...
-}: let
+}:
+let
   cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
-    ${pkgs.cliphist}/bin/cliphist list | \
+    ${lib.getExe pkgs.cliphist} list | \
-    ${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
+    ${lib.getExe pkgs.wofi} --dmenu --insensitive | \
-    ${pkgs.cliphist}/bin/cliphist decode | \
+    ${lib.getExe pkgs.cliphist} decode | \
     ${pkgs.wl-clipboard}/bin/wl-copy
   '';
   screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" ''
-    GEOM="$(${pkgs.slurp}/bin/slurp -d)"
+    GEOM="$(${lib.getExe pkgs.slurp} -d)"
-    ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
+    ${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 {
+in
+{
   wayland.windowManager.sway = {
     enable = true;
     extraSessionCommands = "";
+    extraConfigEarly = '''';
 
     config = {
       fonts = {
@@ -33,15 +36,21 @@ in {
       window.commands = [
         {
           command = "move scratchpad, resize set 1152 648";
-          criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";};
+          criteria = {
+            app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";
+          };
         }
         {
           command = "move scratchpad, resize set 1502 845";
-          criteria = {app_id = "com.viber";};
+          criteria = {
+            app_id = "com.viber";
+          };
         }
         {
           command = "floating enable";
-          criteria = {app_id = "sws_cli";};
+          criteria = {
+            app_id = "sws_cli";
+          };
         }
       ];
 
@@ -60,20 +69,29 @@ in {
       };
 
       input = {
-        "type:keyboard" = {repeat_delay = "150";};
+        "type:keyboard" = {
-        "type:keyboard" = {repeat_rate = "70";};
+          repeat_delay = "150";
-        "type:touchpad" = {tap = "enabled";};
+        };
+        "type:keyboard" = {
+          repeat_rate = "70";
+        };
+        "type:touchpad" = {
+          tap = "enabled";
+        };
       };
 
       bars = [
         {
           position = "top";
           fonts = {
-            names = ["Iosevka" "FontAwesome"];
+            names = [
+              "Iosevka"
+              "FontAwesome"
+            ];
             style = "Bold Semi-Condensed";
             size = 12.0;
           };
-          statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
+          statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
         }
       ];
 
@@ -123,12 +141,15 @@ in {
         "Alt+bracketright" = "focus output right";
         "Alt+bracketleft" = "focus output left";
 
-        "Mod4+l" = ''
+        "Mod4+l" =
-          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
+          ''exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
-        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap";
+        "Mod4+j" =
-        "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
+          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
-        "Mod4+y" = ''
+        "Mod4+h" =
-          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
+          "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${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/whatsapp-for-linux.nix

@@ -1,5 +1,6 @@
 { lib, ... }:
-with lib; {
+with lib;
+{
   xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
     generators.toINI { } {
       General = {

home/zsh.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, lib, ... }:
+{
   programs.z-lua = {
     enableAliases = true;
     enableZshIntegration = true;
@@ -7,16 +8,16 @@
   programs.zsh = {
     autocd = true;
     enableCompletion = false;
-    syntaxHighlighting.enable = true;
     defaultKeymap = "viins";
 
     shellAliases = {
-      cfind = "cscope -C -R -L1";
+      cfind = "${pkgs.cscope}/bin/cscope -C -R -L1";
       chmod = "chmod -v";
       chown = "chown -v";
       cp = "cp -v";
       rm = "rm -v";
       ip = "ip --color=auto";
+      f = "''$(${lib.getExe pkgs.pay-respects} zsh)";
     };
 
     history = {
@@ -37,18 +38,13 @@
         src = pkgs.nix-zsh-completions;
         file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh";
       }
-      {
-        name = "fast_syntax_highlight";
-        src = pkgs.zsh-fast-syntax-highlighting;
-        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
-      }
       {
         name = "pure_prompt";
         src = pkgs.fetchFromGitHub {
           owner = "sindresorhus";
           repo = "pure";
-          rev = "a02209d36c8509c0e62f44324127632999c9c0cf";
+          rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8";
-          hash = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
+          hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=";
         };
         file = "pure.plugin.zsh";
       }
@@ -67,6 +63,11 @@
         };
         file = "sudo.plugin.zsh";
       }
+      {
+        name = "zsh-fast-syntax-highlighting";
+        src = pkgs.zsh-fast-syntax-highlighting;
+        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
+      }
     ];
 
     envExtra = '''';
@@ -91,11 +92,23 @@
         ls;
       }
 
+      function osc7-pwd() {
+       emulate -L zsh # also sets localoptions for us
+       setopt extendedglob
+       local LC_ALL=C
+       printf '\e]7;file://%s%s\e\' $HOST ''${PWD//(#m)([^@-Za-z&-;_~])/%''${(l:2::0:)''$(([##16]#MATCH))}}
+      }
+
+      function chpwd-osc7-pwd() {
+        (( ZSH_SUBSHELL )) || osc7-pwd
+      }
+      add-zsh-hook -Uz chpwd chpwd-osc7-pwd
+
       eval "$(direnv hook zsh)"
       zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
 
       if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then
-      TMUX_EXE="${pkgs.tmux}/bin/tmux"
+        TMUX_EXE="${lib.getExe pkgs.tmux}"
         systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER
       fi
 

magpie/configuration.nix

@@ -3,21 +3,32 @@
   pkgs,
   lib,
   project-cloud,
-  goatcounter,
   nvim,
   system,
   ...
-}: {
+}:
+{
   imports = [ ];
 
   nix.optimise.automatic = true;
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 2;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelParams = [
+    "ip=dhcp"
+    "console=tty"
+  ];
   boot.kernel.sysctl = {
     "net.core.default_qdisc" = "fq";
     "net.ipv4.tcp_congestion_control" = "bbr";
@@ -25,10 +36,13 @@
 
   boot.initrd = {
     compressor = "zstd";
-    availableKernelModules = ["virtio-pci"];
+    availableKernelModules = [
+      "virtio-pci"
+      "virtio-gpu"
+    ];
+    systemd.enable = true;
     network = {
       enable = true;
-      udhcpc.enable = true;
       ssh = {
         enable = true;
         hostKeys = [ /etc/ssh_dummy_ed25519_key ];
@@ -52,7 +66,6 @@
     fzf
     fzy
     git
-    goatcounter.packages.${system}.goatcounter
     nvim.packages.${system}.nvim
     htop-vim
     nvim
@@ -114,14 +127,9 @@
 
   services.goatcounter = {
     enable = true;
-    environmentFile = "/var/lib/goatcounter.env";
+    port = 8002;
-    extraArgs = ["-listen='*:8002'" "-tls=proxy"];
+    proxy = true;
-    database = {
+    address = "127.0.0.1";
-      backend = "sqlite";
-      name = "goatcounter";
-      user = "goatcounter";
-      automigrate = true;
-    };
   };
 
   services.nextcloud = {
@@ -171,12 +179,14 @@
       root = "${project-cloud.packages.${system}.default}/public";
     };
 
+    /*
       virtualHosts.${config.services.nextcloud.hostName} = {
         quic = true;
         http3 = true;
         forceSSL = true;
         enableACME = true;
       };
+    */
 
     virtualHosts."miniflux.project-cloud.net" = {
       quic = true;
@@ -194,7 +204,7 @@
       forceSSL = true;
       enableACME = true;
       locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
+        proxyPass = "http://unix:${toString config.services.gitea.settings.server.HTTP_ADDR}";
       };
     };
 
@@ -222,6 +232,7 @@
       DISABLE_SSH = true;
       HTTP_PORT = 3001;
       LANDING_PAGE = "explore";
+      PROTOCOL = "http+unix";
     };
     settings.mailer = {
       ENABLED = true;
@@ -235,10 +246,16 @@
       REGISTER_EMAIL_CONFIRM = true;
     };
 
-    settings."markup.restructuredtext" = let
+    settings."markup.restructuredtext" =
-      docutils =
+      let
-        pkgs.python3.withPackages (ps: with ps; [docutils pygments]);
+        docutils = pkgs.python3.withPackages (
-    in {
+          ps: with ps; [
+            docutils
+            pygments
+          ]
+        );
+      in
+      {
         ENABLED = true;
         FILE_EXTENSIONS = ".rst";
         RENDER_COMMAND = "${docutils}/bin/rst2html.py";
@@ -278,9 +295,7 @@
     adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
   };
 
-  /*
+  # needed for sendmail mail functionality
-  needed for sendmail mail functionality
-  */
   users.users.gitea.extraGroups = [ "postdrop" ];
   systemd.services.gitea.serviceConfig = {
     RestrictAddressFamilies = [ "AF_NETLINK" ];
@@ -308,24 +323,38 @@
         sopsFile = ./secrets/gitea_db.yaml;
         owner = config.users.users.gitea.name;
       };
+      /*
         "nextcloud_admin" = {
           sopsFile = ./secrets/nextcloud_admin.yaml;
           owner = config.users.users.nextcloud.name;
         };
+      */
     };
   };
 
   networking.hostName = "magpie";
+  networking.firewall = {
+    nftables.enable = true;
+    enable = true;
+    allowedTCPPorts = [
+      80
+      443
+      587
+      2049
+    ]; # http, mail, mail, nfs
+    allowedUDPPorts = [
+      443
+      51820
+    ]; # mail, wireguard
+    allowPing = true;
+    logRefusedConnections = lib.mkDefault false;
+  };
 
-  networking.firewall.enable = true;
+  networking.nat = {
-  networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
+    enable = true;
-  networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
+    externalInterface = "enp1s0";
-  networking.firewall.allowPing = true;
+    internalInterfaces = [ "wg0" ];
-  networking.firewall.logRefusedConnections = lib.mkDefault false;
+  };
-
-  networking.nat.enable = true;
-  networking.nat.externalInterface = "enp1s0";
-  networking.nat.internalInterfaces = ["wg0"];
 
   networking.networkmanager.enable = true;
   networking.wireless.enable = false;
@@ -338,11 +367,11 @@
       # 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 = ''
-        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eth0 -j 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
+      # This undoes the above command, TODO fix command below to be more specific
       postShutdown = ''
-        ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
+        ${pkgs.nftables}/bin/nft flush table ip nat
       '';
       privateKeyFile = config.sops.secrets."wg_privkey".path;
 

magpie/hardware-configuration.nix

@@ -5,12 +5,18 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid" "sr_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "virtio_pci"
+    "usbhid"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];

mediabox/configuration.nix

@@ -8,7 +8,8 @@
   system,
   nvim,
   ...
-}: {
+}:
+{
   imports = [ ];
 
   system.stateVersion = "23.05";
@@ -36,7 +37,10 @@
     gc.options = "--delete-older-than 7d";
     package = pkgs.nixVersions.latest;
     settings = {
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
     };
   };
 
@@ -89,7 +93,11 @@
   networking = {
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 51820];
+      allowedTCPPorts = [
+        80
+        443
+        51820
+      ];
     };
 
     hostName = "mediabox";
@@ -98,7 +106,10 @@
     useDHCP = false;
     wireless.enable = false;
     wireless.interfaces = [ "wlp3s0" ];
-    nameservers = ["127.0.0.1" "::1"];
+    nameservers = [
+      "127.0.0.1"
+      "::1"
+    ];
     dhcpcd.extraConfig = "nohook resolv.conf";
     networkmanager.dns = "none";
     extraHosts = ''
@@ -185,7 +196,11 @@
           Type = "oneshot";
           ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m";
         };
-        wantedBy = ["default.target" "suspend.target" "shutdown.target"];
+        wantedBy = [
+          "default.target"
+          "suspend.target"
+          "shutdown.target"
+        ];
       };
 
       /*
@@ -330,12 +345,18 @@
         }
         {
           keys = [ 122 ];
-          events = ["key" "rep"];
+          events = [
+            "key"
+            "rep"
+          ];
           command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute";
         }
         {
           keys = [ 123 ];
-          events = ["key" "rep"];
+          events = [
+            "key"
+            "rep"
+          ];
           command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute";
         }
         {
@@ -438,7 +459,16 @@
   users.users.akill = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
+    extraGroups = [
+      "wireshark"
+      "wheel"
+      "kvm"
+      "tty"
+      "audio"
+      "sound"
+      "adbusers"
+      "transmission"
+    ];
     openssh.authorizedKeys.keys = [
       (builtins.readFile ../nixy/ssh_pubkey)
     ];
@@ -447,7 +477,16 @@
   users.users.ado = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
+    extraGroups = [
+      "wireshark"
+      "wheel"
+      "kvm"
+      "tty"
+      "audio"
+      "sound"
+      "adbusers"
+      "transmission"
+    ];
   };
 
   users.users.mediauser = {

mediabox/hardware-configuration.nix

@@ -5,12 +5,20 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -18,7 +26,11 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = ["subvol=root" "compress=lzo" "noatime"];
+    options = [
+      "subvol=root"
+      "compress=lzo"
+      "noatime"
+    ];
   };
 
   boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a";
@@ -26,25 +38,41 @@
   fileSystems."/home" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = ["subvol=home" "compress=lzo" "noatime"];
+    options = [
+      "subvol=home"
+      "compress=lzo"
+      "noatime"
+    ];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = ["subvol=nix" "compress=lzo" "noatime"];
+    options = [
+      "subvol=nix"
+      "compress=lzo"
+      "noatime"
+    ];
   };
 
   fileSystems."/persist" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = ["subvol=persist" "compress=lzo" "noatime"];
+    options = [
+      "subvol=persist"
+      "compress=lzo"
+      "noatime"
+    ];
   };
 
   fileSystems."/var/log" = {
     device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
     fsType = "btrfs";
-    options = ["subvol=log" "compress=lzo" "noatime"];
+    options = [
+      "subvol=log"
+      "compress=lzo"
+      "noatime"
+    ];
     neededForBoot = true;
   };
 

modules/nextcloud.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   # Enable Nginx
   services.nginx = {
     enable = true;

modules/qbittorrent.nix

@@ -4,11 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+with lib;
+let
   cfg = config.services.qbittorrent;
   configDir = "${cfg.dataDir}/.config";
   openFilesLimit = 4096;
-in {
+in
+{
   options.services.qbittorrent = {
     enable = mkOption {
       type = types.bool;
@@ -110,7 +112,10 @@ in {
       };
     };
 
-    users.groups =
+    users.groups = mkIf (cfg.group == "qbittorrent") {
-      mkIf (cfg.group == "qbittorrent") {qbittorrent = {gid = null;};};
+      qbittorrent = {
+        gid = null;
+      };
+    };
   };
 }

nixy/configuration.nix

@@ -6,11 +6,19 @@
   system,
   zremap,
   ...
-}: {
+}:
+let
+  USER = "akill";
+in
+{
   imports = [ ];
 
   system.stateVersion = "23.05";
   system.autoUpgrade.enable = false;
+  system.switch = {
+    enable = false;
+    enableNg = true;
+  };
 
   sops = {
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@@ -40,12 +48,12 @@
 
       "borgbase_enc_key" = {
         sopsFile = ./secrets/borgbase_enc_key.yaml;
-        owner = config.users.users.akill.name;
+        owner = config.users.users.${USER}.name;
       };
 
       "borgbase_ssh_key" = {
         sopsFile = ./secrets/borgbase_ssh_key.yaml;
-        owner = config.users.users.akill.name;
+        owner = config.users.users.${USER}.name;
       };
     };
   };
@@ -57,17 +65,30 @@
     package = pkgs.nixVersions.latest;
     settings = {
       sandbox = true;
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
     };
   };
 
   boot = {
-    extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
+    extraModulePackages = with config.boot.kernelPackages; [
+      usbip
+      v4l2loopback
+    ];
     initrd.compressor = "zstd";
-    initrd.kernelModules = ["amdgpu"];
+    initrd.kernelModules = [ ];
-    binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
+    initrd.systemd.enable = true;
+    binfmt.emulatedSystems = [
+      "wasm32-wasi"
+      "x86_64-windows"
+    ];
+    kernelParams = [
+      "psmouse.synaptics_intertouch=0"
+      "mem_sleep_default=deep"
+    ];
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
@@ -79,7 +100,9 @@
       memtest86.enable = true;
     };
     readOnlyNixStore = true;
-    supportedFilesystems = ["f2fs" "xfs"];
+    supportedFilesystems = [
+      "xfs"
+    ];
     tmp.useTmpfs = true;
   };
 
@@ -90,7 +113,7 @@
     doas.enable = true;
     doas.extraRules = [
       {
-        users = ["akill"];
+        users = [ USER ];
         keepEnv = true;
         persist = true;
       }
@@ -102,13 +125,22 @@
   };
 
   networking = {
+    nftables.enable = true;
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 51820 8020];
+      allowedTCPPorts = [
+        80
+        443
+        51820
+        8020
+      ];
     };
 
     hostName = "nixy";
-    nameservers = ["127.0.0.1" "::1"];
+    nameservers = [
+      "127.0.0.1"
+      "::1"
+    ];
     dhcpcd.extraConfig = "nohook resolv.conf";
 
     extraHosts = ''
@@ -151,14 +183,35 @@
           }
         ];
       };
+
+      neox_wg = {
+        ips = [ "192.168.51.2/32" ];
+        privateKeyFile = config.sops.secrets."wg_privkey".path;
+        peers = [
+          {
+            publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
+            allowedIPs = [ "192.168.2.0/24" ];
+            endpoint = "185.194.64.26:51820";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
     };
   };
 
   time.timeZone = "Europe/Sarajevo";
 
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
+  nixpkgs.overlays = [
+    nix-xilinx.overlay
+    nvim.overlays.${system}.overlay
+  ];
   environment = {
+    etc = {
+      "firejail/qutebrowser.local".text = ''
+        whitelist ''${RUNUSER}/qutebrowser
+      '';
+    };
     extraInit = ''
       unset -v SSH_ASKPASS
     '';
@@ -169,6 +222,12 @@
   };
 
   programs = {
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = false;
+      localNetworkGameTransfers.openFirewall = true;
+    };
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -209,8 +268,8 @@
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = "${pkgs.iproute}/bin/ip netns add %I";
+          ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
-          ExecStop = "${pkgs.iproute}/bin/ip netns del %I";
+          ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
         };
       };
 
@@ -227,23 +286,25 @@
           ExecStart = pkgs.writers.writeBash "wg-up" ''
             set -e
             ENDPOINT_IP=$(${pkgs.coreutils-full}/bin/cat "${config.sops.secrets."wg_endpoint_proton".path}")
-            ${pkgs.iproute}/bin/ip link add proton_wg type wireguard
+            ${pkgs.iproute2}/bin/ip link add proton_wg type wireguard
-            ${pkgs.iproute}/bin/ip link set proton_wg netns wg
+            ${pkgs.iproute2}/bin/ip link set proton_wg netns wg
-            ${pkgs.iproute}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
-            ${pkgs.iproute}/bin/ip netns exec wg \
+            ${pkgs.iproute2}/bin/ip netns exec wg \
-              ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
+              ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${
-            ${pkgs.iproute}/bin/ip netns exec wg \
+                config.sops.secrets."wg_privkey_proton".path
+              }"
+            ${pkgs.iproute2}/bin/ip netns exec wg \
               ${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
                 endpoint "$ENDPOINT_IP:51820" \
                 persistent-keepalive "25" \
                 allowed-ips "0.0.0.0/0"
-            ${pkgs.iproute}/bin/ip -n wg link set lo up
+            ${pkgs.iproute2}/bin/ip -n wg link set lo up
-            ${pkgs.iproute}/bin/ip -n wg link set proton_wg up
+            ${pkgs.iproute2}/bin/ip -n wg link set proton_wg up
-            ${pkgs.iproute}/bin/ip -n wg route add default dev proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg route add default dev proton_wg
           '';
           ExecStop = pkgs.writers.writeBash "wg-down" ''
-            ${pkgs.iproute}/bin/ip -n wg route del default dev proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg route del default dev proton_wg
-            ${pkgs.iproute}/bin/ip -n wg link del proton_wg
+            ${pkgs.iproute2}/bin/ip -n wg link del proton_wg
           '';
         };
       };
@@ -300,6 +361,7 @@
       };
     };
 
+    coredump.enable = false;
     extraConfig = ''
       DefaultTimeoutStartSec=30s
       DefaultTimeoutStopSec=30s
@@ -309,6 +371,7 @@
   services = {
     acpid.enable = true;
     dbus.enable = true;
+    dbus.implementation = "broker";
     fstrim.enable = true;
     fwupd.enable = true;
     ntp.enable = true;
@@ -322,6 +385,12 @@
       pulse.enable = true;
     };
 
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
     libinput.enable = true;
     xserver = {
       enable = true;
@@ -335,7 +404,10 @@
     };
 
     udev = {
-      packages = [pkgs.openhantek6022 pkgs.openocd];
+      packages = [
+        pkgs.openhantek6022
+        pkgs.openocd
+      ];
       extraRules = ''
         #Xilinx FTDI
         ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@@ -368,19 +440,25 @@
         {
           keys = [ 113 ];
           events = [ "key" ];
-          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
+          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'";
         }
 
         {
           keys = [ 114 ];
-          events = ["key" "rep"];
+          events = [
-          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
+            "key"
+            "rep"
+          ];
+          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'";
         }
 
         {
           keys = [ 115 ];
-          events = ["key" "rep"];
+          events = [
-          command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
+            "key"
+            "rep"
+          ];
+          command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'";
         }
 
         {
@@ -411,16 +489,18 @@
             "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
             "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
           ];
-          cache_file = "public-resolvers.md";
+          cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md";
           minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
         };
       };
     };
 
-    borgbackup.jobs."borgbase" = let
+    borgbackup.jobs."borgbase" =
-      user = config.users.users.akill;
+      let
+        user = config.users.users.${USER};
         home = user.home;
-    in {
+      in
+      {
         user = user.name;
         paths = [
           (home + "/pic/priv")
@@ -491,24 +571,34 @@
       dina-font
       fira-code
       fira-code-symbols
-      font-awesome
+      font-awesome_6
-      font-awesome_4
       inconsolata
       iosevka
       jetbrains-mono
       liberation_ttf
+      libertine
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
+      noto-fonts-color-emoji
       noto-fonts-emoji
       proggyfonts
       siji
       terminus_font
       terminus_font_ttf
       ubuntu_font_family
+      vistafonts
     ];
   };
 
   virtualisation = {
+    libvirtd = {
+      enable = true;
+      allowedBridges = [
+        "virbr0"
+        "br0"
+      ];
+    };
+    spiceUSBRedirection.enable = true;
     containers.storage.settings = {
       storage = {
         graphroot = "/var/lib/containers/storage";
@@ -522,7 +612,6 @@
     };
   };
 
-
   hardware = {
     bluetooth = {
       enable = true;
@@ -545,9 +634,18 @@
     algorithm = "zstd";
   };
 
-  users.users.akill = {
+  users.users.${USER} = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout" "wheel"];
+    extraGroups = [
+      "wireshark"
+      "kvm"
+      "tty"
+      "audio"
+      "sound"
+      "adbusers"
+      "dialout"
+      "wheel"
+    ];
   };
 }

nixy/hardware-configuration.nix

@@ -1,38 +1,60 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
+  boot.initrd.luks.devices."crypt_dev".device =
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+    "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
+  boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "ehci_pci"
+    "xhci_pci"
+    "uas"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
+  boot.kernelModules = [
+    "kvm-amd"
+    "amd-gpu"
+  ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
+    device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
     fsType = "xfs";
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
+    device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
     fsType = "xfs";
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
+    device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
     fsType = "xfs";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/828E-F3C3";
+    device = "/dev/disk/by-uuid/828E-F3C3";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ ];

nixy/wg_pubkey_nx

@@ -0,0 +1 @@
+eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=

packages/viber/default.nix

@@ -44,12 +44,12 @@
 }:
 stdenv.mkDerivation {
   pname = "viber";
-  version = "21.8.0.11";
+  version = "23.2.0.3";
 
   src = fetchurl {
     # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb
     url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
-    hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw=";
+    hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -115,7 +115,8 @@ stdenv.mkDerivation {
     xorg.libxkbfile
   ];
 
-  installPhase = let
+  installPhase =
+    let
       viberWrap = writeShellScriptBin "viberWrap" ''
         ${bubblewrap}/bin/bwrap --bind / / \
         --dev /dev \
@@ -124,7 +125,8 @@ stdenv.mkDerivation {
         --bind  $HOME/Downloads/ $HOME/Downloads \
         $@
       '';
-  in ''
+    in
+    ''
       dpkg-deb -x $src $out
       mkdir -p $out/bin