fuji: remove unused alsa config/env;

flake.lock

@@ -37,13 +37,13 @@
       "locked": {
         "lastModified": 1767039857,
         "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772665116,
-        "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=",
+        "lastModified": 1772893680,
+        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198",
+        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
         "type": "github"
       },
       "original": {
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772633058,
-        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
+        "lastModified": 1777851538,
+        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
+        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1778003029,
+        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1778003029,
+        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
         "type": "github"
       },
       "original": {
@@ -236,17 +236,14 @@
         ]
       },
       "locked": {
-        "lastModified": 1772763116,
-        "narHash": "sha256-5NUtdVWnEflm829QI0BIj2rDhI+pfagt+cxIARJEhi8=",
-        "owner": "simple-nixos-mailserver",
-        "repo": "nixos-mailserver",
-        "rev": "c04152fa90ba5079f4517aa24383245937e43ab8",
-        "type": "gitlab"
+        "lastModified": 1773912645,
+        "narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=",
+        "type": "tarball",
+        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.11/nixos-mailserver-nixos-25.11.tar.gz"
       },
       "original": {
-        "owner": "simple-nixos-mailserver",
-        "repo": "nixos-mailserver",
-        "type": "gitlab"
+        "type": "tarball",
+        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.11/nixos-mailserver-nixos-25.11.tar.gz"
       }
     },
     "sops-nix": {
@@ -256,11 +253,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772495394,
-        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -36,7 +36,7 @@
     };
 
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
+      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.11/nixos-mailserver-nixos-25.11.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

fuji/configuration.nix

@@ -93,11 +93,24 @@ in
       "xe.force_probe=a7a0"
       "i915.force_probe=!a7a0"
     ];
-    kernelPackages = pkgs.linuxPackages_latest;
+    #kernelPackages = pkgs.linuxPackages_latest;
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
       "net.ipv4.tcp_congestion_control" = "bbr";
       "kernel.unprivileged_userns_clone" = "1"; /* Needed with harderned kernel */
+      "kernel.kptr_restrict" = 2;
+      "kernel.dmesg_restrict" = 1;
+      "kernel.kexec_load_disabled" = 1;
+      "kernel.yama.ptrace_scope" = 1;
+      "net.ipv4.conf.all.rp_filter" = 1;
+      "net.ipv4.conf.default.rp_filter" = 1;
+      "net.ipv4.conf.all.log_martians" = 1;
+      "net.ipv4.conf.all.accept_redirects" = 0;
+      "net.ipv4.conf.default.accept_redirects" = 0;
+      "net.ipv4.conf.all.send_redirects" = 0;
+      "net.ipv4.conf.default.send_redirects" = 0;
+      "net.ipv6.conf.all.accept_redirects" = 0;
+      "net.ipv6.conf.default.accept_redirects" = 0;
     };
     loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot = {
@@ -116,6 +129,7 @@ in
     rtkit.enable = true;
     allowSimultaneousMultithreading = true;
     sudo.enable = true;
+    sudo.execWheelOnly = true;
     doas.enable = true;
     doas.extraRules = [
       {
@@ -124,6 +138,10 @@ in
         persist = true;
       }
     ];
+    apparmor = {
+      enable = true;
+      killUnconfinedConfinables = true;
+    };
   };
 
   powerManagement = {
@@ -134,6 +152,7 @@ in
     nftables.enable = true;
     firewall = {
       enable = true;
+      logRefusedConnections = true;
       allowedTCPPorts = [
         80
         443
@@ -199,8 +218,8 @@ in
     nvim.overlays.${system}.overlay
   ];
   environment = {
-    systemPackages = with pkgs; [ alsa-ucm-conf maliit-keyboard ];
-    variables.ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf}/share/alsa/ucm2";
+    #memoryAllocator.provider = "mimalloc";
+    systemPackages = with pkgs; [ maliit-keyboard ];
 
     sessionVariables = {
       LIBVA_DRIVER_NAME = "iHD";
@@ -238,7 +257,7 @@ in
     };
     appimage = {
       enable = true;
-      binfmt = true;
+      binfmt = false;
     };
     nix-ld = {
       enable = false;
@@ -247,7 +266,12 @@ in
         zlib
       ];
     };
-    zsh.enable = true;
+    zsh = {
+      enable = true;
+      promptInit = "";
+      enableCompletion = false;
+      setOptions = [ ];
+    };
     firejail.enable = true;
     adb.enable = true;
     wireshark.enable = true;
@@ -417,8 +441,12 @@ in
       };
     };
 
-    logind = {
-      powerKey = "suspend";
+    logind.settings.Login = {
+      HandlePowerKey = "suspend";
+      HandleLidSwitch = "suspend";
+      HandleLidSwitchExternalPower = "suspend";
+      HandleLidSwitchDocked = "ignore";
+      KillUserProcesses = true;
     };
 
     desktopManager = {
@@ -598,10 +626,6 @@ in
       SystemMaxUse=50M
     '';
 
-    logind.settings.Login = {
-      KillUserProcesses = true;
-    };
-
   };
 
   fonts = {

fuji/hardware-configuration.nix

@@ -21,12 +21,14 @@
     {
       device = "/dev/mapper/fuji_lvm_root-root";
       fsType = "xfs";
+      options = [ "noatime" "logbsize=256k" ];
     };
 
   fileSystems."/home" =
     {
       device = "/dev/mapper/fuji_lvm_root-home";
       fsType = "xfs";
+      options = [ "noatime" "logbsize=256k" ];
     };
 
   fileSystems."/boot" =

home/common/zsh.nix

@@ -12,7 +12,7 @@
 
   programs.zsh = {
     autocd = true;
-    enableCompletion = false;
+    enableCompletion = true;
     defaultKeymap = "viins";
     /* dotDir = "\"$XDG_CONFIG_HOME\"/zsh"; */
 
@@ -89,7 +89,7 @@
       RPS1=""
 
       function chpwd() {
-        ls;
+        ls --color=tty;
       }
 
       function osc7-pwd() {

home/fuji/home.nix

@@ -36,6 +36,16 @@ in
     };
   };
 
+  gtk = {
+    enable = true;
+    theme = { name = "Adwaita-dark"; package = pkgs.gnome-themes-extra; };
+  };
+  qt = {
+    enable = true;
+    style.name = "adwaita-dark";
+    platformTheme.name = "gtk";
+  };
+
   fonts.fontconfig.enable = true;
 
   home.sessionVariables = rec {
@@ -91,6 +101,9 @@ in
         pkgs.mpvScripts.uosc
         pkgs.mpvScripts.webtorrent-mpv-hook
       ];
+      scriptOpts.webtorrent = {
+        path = "/tmp";
+      };
       config = {
         osc = "no";
         osd-bar = "no";
@@ -101,6 +114,16 @@ in
         vo = "dmabuf-wayland";
         ao = "pipewire";
         ytdl-format = "bestvideo[height<=1080]+bestaudio/best[height<=1080]";
+        video-osd = "yes";
+        osd-back-color = "0.0/0.0/0.0/0.0";
+      };
+
+      scriptOpts = {
+        uosc = {
+          disable_elements = "buffering_indicator";
+          timeline_style = "bar";
+          top_bar = "no-border";
+        };
       };
 
       bindings = {
@@ -158,6 +181,7 @@ in
       };
 
       settings = {
+        colors.webpage.preferred_color_scheme = "dark";
         content.notifications.enabled = false;
         content.pdfjs = true;
         content.webgl = false;