flake: update

This reverts commit 8ef4d1145f.

flake.lock

@@ -35,11 +35,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1747046372,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -48,6 +48,54 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "simple-nixos-mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -55,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747556831,
+        "lastModified": 1748226808,
-        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
+        "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
+        "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
         "type": "github"
       },
       "original": {
@@ -92,11 +140,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747953325,
+        "lastModified": 1748162331,
-        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
         "type": "github"
       },
       "original": {
@@ -106,19 +154,20 @@
         "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": {
@@ -180,17 +229,18 @@
       "inputs": {
         "blobs": "blobs",
         "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": 1746937334,
+        "lastModified": 1747965231,
-        "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=",
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
         "type": "gitlab"
       },
       "original": {
@@ -206,11 +256,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746485181,
+        "lastModified": 1747603214,
-        "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
         "type": "github"
       },
       "original": {

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