hermit: programs: drop wordgrinder

My efforts to use nushell as a default shell have been
for naught so far. It silently breaks stuff you wouln't
expect it to break, like shipping environment variables
and stuff.

hosts/hermit/configuration.nix

@@ -24,7 +24,6 @@
 
   modules = {
     wms.wayland.enable = true;
-    desktops.hyprland.enable = false;
     # desktops.niri.enable = true;
 
     theming = {
@@ -34,6 +33,7 @@
 
     system = {
       systemType = "laptop";
+      isGraphical = true;
 
       boot = {
         systemd-boot.enable = true;
@@ -55,11 +55,6 @@
         editors = {
           helix.enable = true;
         };
-        # nushell.enable = true;
-        # starship.enable = true;
-        terminals = {
-          foot.enable = true;
-        };
       };
       sound.enable = true;
     };
@@ -82,7 +77,6 @@
       btop.enable = true;
       nh.enable = true;
       thunar.enable = true;
-      schizofox.enable = false;
     };
   };
   system.stateVersion = "23.11";

hosts/hermit/programs.nix

@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = builtins.attrValues {
-    inherit (pkgs)
+    inherit
+      (pkgs)
       abook
       aerc
       aichat
@@ -72,10 +72,8 @@
       vlc
       wiki-tui
       wireguard-tools
-      wordgrinder
       xournalpp
       zathura
       ;
-    inherit new-nil;
   };
 }

modules/home/programs/ghostty.hjem.nix

@@ -31,7 +31,7 @@ let
     font-family = "JetBrainsMonoNerdFont";
 
     app-notifications = "no-clipboard-copy";
-    background-opacity = 0.7;
+    background-opacity = 1.0;
     bold-is-bright = "true";
     confirm-close-surface = "false";
     cursor-style-blink = "false";

modules/other/users.mod.nix

@@ -57,6 +57,8 @@ in
     };
   };
   config = {
+    # environment.shells = [ pkgs.nushell ];
+    programs.zsh.enable = true;
     users = {
       mutableUsers = true;
       users = {
@@ -71,7 +73,7 @@ in
             "nix"
             "docker"
           ];
-          shell = pkgs.nushell;
+          shell = pkgs.zsh;
         };
       };
     };

modules/packages/packages.mod.nix

@@ -10,9 +10,11 @@ in
   environment.systemPackages =
     with pkgs;
     [
+      universal-android-debloater
       emacs-pgtk
       # better cd
       zoxide
+      ouch
       # pipe viewer
       pv
       # hex editor

modules/programs/gui/brave.mod.nix

@@ -10,18 +10,19 @@ let
   # https://peter.sh/experiments/chromium-command-line-switches/
   flags = concatStringsSep " " [
     "--no-first-run"
-    "--enable-features=UseOzonePlatform"
     "--enable-gpu-rasterization"
     "--force-dark-mode"
     "--enable-smooth-scrolling"
     "--enable-features=UseOzonePlatform"
     "--ozone-platform=wayland"
     "--user-agent='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.3'"
+    # https://source.chromium.org/chromium/chromium/src/+/main:headless/app/headless_shell_switches.cc;drc=3556fbff47c18193f4a39d2496596e89b8307a15;l=47-55
+    "--password-store=gnome-keyring"
   ];
   brave-wrapped = pkgs.symlinkJoin {
     name = "brave";
     paths = [
-      (pkgs.brave.override { vulkanSupport = true; })
+      pkgs.brave
     ];
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postBuild = ''

modules/programs/gui/steam.mod.nix

@@ -31,7 +31,10 @@ in
       gamescopeSession.enable = true;
       extraCompatPackages = [ pkgs.proton-ge-bin.steamcompattool ];
     };
-    # See
+
+    services.udev.extraRules = ''
+      SUBSYSTEM=="input", ATTRS{idVendor}=="2dc8", ATTRS{idProduct}=="3106", MODE="0660", GROUP="input"
+    ''; # See
     # https://wiki.nixos.org/wiki/GameMode
     programs.gamemode.enable = true;
   };

modules/services/greetd.mod.nix

@@ -12,7 +12,6 @@ let
 
   inherit (config.meta.mainUser) username;
   cfg = config.modules.services.greetd;
-  uwsmEnabled = config.modules.services.uwsm.enable;
 in
 {
   options.modules.services.greetd = {
@@ -28,8 +27,7 @@ in
     session = mkOption {
       description = "Which login session to start";
       type = str;
-      default =
+      default = "niri";
-        if uwsmEnabled then "${getExe config.programs.uwsm.package} start Hyprland" else "Hyprland";
     };
   };
 
@@ -37,20 +35,17 @@ in
     services.greetd =
       let
         session = {
-          # command = ''
+          command = ''
-          # ${pkgs.greetd.tuigreet}/bin/tuigreet \
+            ${getExe pkgs.greetd.tuigreet} \
-          #   -c \"${cfg.session}\" \
+              -c \"${cfg.session}\" \
-          #   -r
+              -r
-          #   -t --time-format "DD.MM.YYYY"
+              -t --time-format "DD.MM.YYYY"
-          #   --asteriks'';
+              --asteriks'';
-
+          user = "greeter";
-          command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
-          user = username;
         };
       in
       {
         enable = true;
-        package = pkgs.greetd;
         vt = 7;
         settings = {
           default_session = session;

modules/system/boot/lanzaboote.mod.nix

@@ -4,17 +4,19 @@
   pkgs,
   sources,
   ...
-}:
+}: let
-let
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
 
   cfg = config.modules.system.boot.lanzaboote;
-in
+in {
-{
   options.modules.system.boot.lanzaboote.enable = mkEnableOption "Lanzaboote";
   imports = [
-    (sources.lanzaboote + "/nix/modules/lanzaboote.nix")
+    (import sources.flake-compat {
+      src = sources.lanzaboote;
+      copySourceTreeToStore = false;
+      useBuiltinsFetchTree = true;
+    }).outputs.nixosModules.lanzaboote
   ];
 
   config = mkIf cfg.enable {
@@ -31,6 +33,6 @@ in
       loader.systemd-boot.enable = lib.mkForce false;
     };
 
-    environment.systemPackages = [ pkgs.sbctl ];
+    environment.systemPackages = [pkgs.sbctl];
   };
 }

modules/system/os/security/security.mod.nix

@@ -1,4 +1,7 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
+let
+  inherit (lib.modules) mkForce;
+in
 {
   security = {
     # Enable Soteria, a GTK-based Polkit authentication agent.
@@ -9,23 +12,25 @@
       packages = [ pkgs.apparmor-profiles ];
     };
 
-    pam.services = {
+    pam.services.login.enableGnomeKeyring = true;
-      login.kwallet = {
+
-        enable = true;
+    wrappers.gnome-keyring-daemon = {
-        # package = pkgs.kdePackages.kwallet-pam;
+      owner = "root";
-      };
+      group = "root";
-      niri = {
+      capabilities = "cap_ipc_lock=ep";
-        allowNullPassword = true;
+      source = "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon";
-        kwallet = {
-          enable = true;
-          package = pkgs.kdePackages.kwallet-pam;
-        };
-      };
     };
   };
-  environment.systemPackages = with pkgs.kdePackages; [
+  services = {
-    kwallet # provides helper service
+    dbus.packages = [
-    kwallet-pam # provides helper service
+      pkgs.gnome-keyring
-    kwalletmanager # provides KCMs and stuff
+    ];
+    gnome.gcr-ssh-agent.enable = mkForce false;
+  };
+  xdg.portal.extraPortals = [
+    pkgs.gnome-keyring
+  ];
+  environment.systemPackages = [
+    pkgs.gnome-keyring
   ];
 }

modules/wms/niri/config.kdl

@@ -66,9 +66,7 @@ layout {
     }
     background-color "transparent"
 }
-// xwayland stuff
+spawn-at-startup "waybar"
-// spawn-at-startup "xwayland-satellite"
-spawn-at-startup "kwalletd6"
 spawn-at-startup "nu" "-c" "quickshell --path ~/repos/projects/nichts/main/modules/style/quickshell/shell"
 environment {
     DISPLAY ":0"
@@ -85,37 +83,15 @@ switch-events {
     }
 }
 overview {
-    zoom 0.60
+    zoom 0.6
     backdrop-color "#777777"
 }
 animations {
     window-close {
-    duration-ms 250
+        duration-ms 250
-    curve "linear"
+        curve "linear"
-    custom-shader r"
+        custom-shader "\n    vec4 fall_and_rotate(vec3 coords_geo, vec3 size_geo) {\n\n        float progress = niri_clamped_progress * niri_clamped_progress;\n        vec2 coords = (coords_geo.xy - vec2(0.5, 1.0)) * size_geo.xy;\n        coords.y -= progress * 1440.0;\n        float random = (niri_random_seed - 0.5) / 2.0;\n        random = sign(random) - random;\n        float max_angle = 0.5 * random;\n        float angle = progress * max_angle;\n        mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle));\n        coords = rotate * coords;\n        coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 1.0), 1.0);\n        vec3 coords_tex = niri_geo_to_tex * coords_geo;\n        vec4 color = texture2D(niri_tex, coords_tex.st);\n\n        return color;\n    }\n\n    vec4 close_color(vec3 coords_geo, vec3 size_geo) {\n        return fall_and_rotate(coords_geo, size_geo);\n    }\n    "
-    vec4 fall_and_rotate(vec3 coords_geo, vec3 size_geo) {
-
-        float progress = niri_clamped_progress * niri_clamped_progress;
-        vec2 coords = (coords_geo.xy - vec2(0.5, 1.0)) * size_geo.xy;
-        coords.y -= progress * 1440.0;
-        float random = (niri_random_seed - 0.5) / 2.0;
-        random = sign(random) - random;
-        float max_angle = 0.5 * random;
-        float angle = progress * max_angle;
-        mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle));
-        coords = rotate * coords;
-        coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 1.0), 1.0);
-        vec3 coords_tex = niri_geo_to_tex * coords_geo;
-        vec4 color = texture2D(niri_tex, coords_tex.st);
-
-        return color;
     }
-
-    vec4 close_color(vec3 coords_geo, vec3 size_geo) {
-        return fall_and_rotate(coords_geo, size_geo);
-    }
-    "
-   }
 }
 window-rule {
     match app-id="unset"
@@ -132,7 +108,6 @@ window-rule {
 window-rule {
     draw-border-with-background false
 }
-
 // Fix discord screencasting
 debug {
     wait-for-frame-completion-in-pipewire
@@ -155,8 +130,11 @@ binds {
     Mod+B {
         spawn "brave"
     }
+    // Mod+D {
+    //     spawn "nu" "-c" "quickshell --path ~/repos/projects/nichts/main/modules/style/quickshell/shell msg launcher open"
+    // }
     Mod+D {
-        spawn "nu" "-c" "quickshell --path ~/repos/projects/nichts/main/modules/style/quickshell/shell msg launcher open"
+        spawn "fuzzel"
     }
     Mod+Alt+L {
         spawn "swaylock"
@@ -436,9 +414,9 @@ binds {
     //     spawn "sh" "-c" ""
     // }
     Mod+T {
-        screenshot 
+        screenshot
     }
-        // "$mainMod, T, exec, ${getExe pkgs.grimblast} save area - | ${getExe pkgs.tesseract} - - | ${getExe' pkgs.wl-clipboard "wl-copy"}"
+    // "$mainMod, T, exec, ${getExe pkgs.grimblast} save area - | ${getExe pkgs.tesseract} - - | ${getExe' pkgs.wl-clipboard "wl-copy"}"
     Mod+Escape allow-inhibiting=false {
         toggle-keyboard-shortcuts-inhibit
     }

modules/wms/niri/niri.mod.nix

@@ -11,91 +11,100 @@ let
   inherit (config.modules.system) isGraphical;
   inherit (config.meta.mainUser) username;
 
-
   cfg = config.modules.desktops.niri;
 
-  niri = pkgs.callPackage (_: pkgs.rustPlatform.buildRustPackage {
+  niri = pkgs.callPackage (
-    pname = "niri";
+    _:
-    version = "unstable";
+    pkgs.rustPlatform.buildRustPackage {
+      pname = "niri";
+      version = "unstable";
 
-    src = sources.niri;
+      src = sources.niri;
-    postPatch = ''
+      postPatch = ''
-      patchShebangs resources/niri-session
+        patchShebangs resources/niri-session
-      substituteInPlace resources/niri.service \
+        substituteInPlace resources/niri.service \
-        --replace-fail '/usr/bin' "$out/bin"
+          --replace-fail '/usr/bin' "$out/bin"
-    '';
+      '';
 
-    cargoLock = {
+      cargoLock = {
-      allowBuiltinFetchGit = true;
+        allowBuiltinFetchGit = true;
-      lockFile = "${sources.niri}/Cargo.lock";
+        lockFile = "${sources.niri}/Cargo.lock";
-    };
+      };
 
-    strictDeps = true;
+      strictDeps = true;
-    doInstallCheck = false;
+      doInstallCheck = false;
+      doCheck = false;
 
-    nativeBuildInputs = with pkgs; [
+      nativeBuildInputs = with pkgs; [
-      rustPlatform.bindgenHook
+        rustPlatform.bindgenHook
-      pkg-config
+        pkg-config
-      installShellFiles
+        installShellFiles
-    ];
+      ];
 
-    buildInputs = with pkgs; [
+      buildInputs = with pkgs; [
-      cairo
+        cairo
-      dbus
+        dbus
-      libGL
+        libGL
-      libdisplay-info
+        libdisplay-info
-      libinput
+        libinput
-      seatd
+        seatd
-      libxkbcommon
+        libxkbcommon
-      libgbm
+        libgbm
-      pango
+        pango
-      wayland
+        wayland
-      dbus
+        dbus
-      pipewire
+        pipewire
-      # Also includes libudev
+        # Also includes libudev
-      systemd
+        systemd
-    ];
+      ];
 
-    buildFeatures = [
+      buildFeatures = [
-      "dbus"
+        "dbus"
-      "dinit"
+        "dinit"
-      "xdp-gnome-screencast"
+        "xdp-gnome-screencast"
-      "systemd"
+        "systemd"
-    ];
+      ];
-    buildNoDefaultFeatures = true;
+      buildNoDefaultFeatures = true;
 
-    postInstall = ''
+      postInstall = ''
-      installShellCompletion --cmd niri \
+        installShellCompletion --cmd niri \
-        --bash <($out/bin/niri completions bash) \
+          --bash <($out/bin/niri completions bash) \
-        --fish <($out/bin/niri completions fish) \
+          --fish <($out/bin/niri completions fish) \
-        --zsh <($out/bin/niri completions zsh)
+          --zsh <($out/bin/niri completions zsh)
 
-      install -Dm644 resources/niri.desktop -t $out/share/wayland-sessions
+        install -Dm644 resources/niri.desktop -t $out/share/wayland-sessions
-      install -Dm644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
+        install -Dm644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
-      install -Dm755 resources/niri-session $out/bin/niri-session
+        install -Dm755 resources/niri-session $out/bin/niri-session
-      install -Dm644 resources/niri{.service,-shutdown.target} -t $out/share/systemd/user
+        install -Dm644 resources/niri{.service,-shutdown.target} -t $out/share/systemd/user
-    '';
+      '';
 
-    env = {
+      env = {
-      # Force linking with libEGL and libwayland-client
+        # Force linking with libEGL and libwayland-client
-      # so they can be discovered by `dlopen()`
+        # so they can be discovered by `dlopen()`
-      RUSTFLAGS = toString (
+        RUSTFLAGS = toString (
-        map (arg: "-C link-arg=" + arg) [
+          map (arg: "-C link-arg=" + arg) [
-          "-Wl,--push-state,--no-as-needed"
+            "-Wl,--push-state,--no-as-needed"
-          "-lEGL"
+            "-lEGL"
-          "-lwayland-client"
+            "-lwayland-client"
-          "-Wl,--pop-state"
+            "-Wl,--pop-state"
-        ]
+          ]
-      );
+          ++ [
-    };
+            "-Ctarget-cpu=native"
+            "-Cpanic=abort"
+            "-Clto=thin"
+            "-Cembed-bitcode=yes"
+          ]
+        );
+      };
 
-    passthru = {
+      passthru = {
-      providedSessions = [ "niri" ];
+        providedSessions = [ "niri" ];
-    };
+      };
 
-    meta.mainProgram = "niri";
+      meta.mainProgram = "niri";
 
-  }) { };
+    }
+  ) { };
 in
 {
   options.modules.desktops.niri.enable = mkEnableOption "Niri, a scolling tiling wayland compositor";
@@ -117,6 +126,7 @@ in
         avizo
         playerctl
         wl-clipboard
+        fuzzel
         ;
     };
   };

npins/sources.json

@@ -63,9 +63,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "9d8ab804355d95d38a61ad5053d415ca1882d554",
+      "revision": "43d6a79863d5e28b6a2cd98ecb22fe4ff491057e",
-      "url": "https://git.lix.systems/lix-project/lix/archive/9d8ab804355d95d38a61ad5053d415ca1882d554.tar.gz",
+      "url": "https://git.lix.systems/lix-project/lix/archive/43d6a79863d5e28b6a2cd98ecb22fe4ff491057e.tar.gz",
-      "hash": "sha256-CFoDQz2mnfKWtAb6Y01xu+bfM+Q/6dHGkxKq6W+dzN8="
+      "hash": "sha256-/C+d8ET7B935H+xY9NTlw2kFiCeDq380yhv9Ez4379k="
     },
     "lix-module": {
       "type": "Git",
@@ -142,8 +142,8 @@
     "nixpkgs": {
       "type": "Channel",
       "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre832020.6b4955211758/nixexprs.tar.xz",
+      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre833298.83e677f31c84/nixexprs.tar.xz",
-      "hash": "sha256-X3H1JILbG//yt1OHrx7GHwyIUoqmR9jXARlwbZyPF4k="
+      "hash": "sha256-GCDhyo1oW8YXwYNKSsJzwy4ilTMnRrPh+6OTWatUYn4="
     },
     "npins": {
       "type": "Git",
@@ -166,9 +166,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "759bd721dfd38e2ce02048f378ee025bcb175f93",
+      "revision": "db77c71c216530159c2dcf5b269ebb4706b2e2dd",
       "url": null,
-      "hash": "sha256-GjN9BXxWMlmIAAcKYrsrEPVT/cJkWieG3YOJG7sJuGk="
+      "hash": "sha256-QG14m53ZGp2Gk7xD2Q+Tf7RYCKfk/BYRaBtX3X4IKbc="
     },
     "spicetify-nix": {
       "type": "Git",
@@ -179,9 +179,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "8f9fd947c52aa6adb6bafe72516eccf186708954",
+      "revision": "51ac0aee7e7ee21ca0874b913f07f9004bc9311f",
-      "url": "https://github.com/Gerg-L/spicetify-nix/archive/8f9fd947c52aa6adb6bafe72516eccf186708954.tar.gz",
+      "url": "https://github.com/Gerg-L/spicetify-nix/archive/51ac0aee7e7ee21ca0874b913f07f9004bc9311f.tar.gz",
-      "hash": "sha256-R2iDZb94RosuCeuIukacZVVXxzWYr4jn/QI/ax15nW8="
+      "hash": "sha256-1AK8+W7d5eNyGRkcWHa+9oIChLJbY6jt7ujSJo+ft4M="
     },
     "systems": {
       "type": "Git",