From dc52bd8277edb3424e154af64be5ff1dbf73c39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 4 Feb 2026 07:59:49 +0100
Subject: [PATCH] niri: finalize(?)

---
 flake.nix                 | 39 ++++++++++++++++++++++++---------------
 modules/git.nix           |  2 +-
 modules/niri/default.nix  |  8 +++++++-
 modules/vim.nix           |  4 ++--
 packages/ashell.nix       |  1 +
 packages/niri/default.nix | 19 +++++++------------
 6 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6512261..3b85d6f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,27 +37,36 @@
       };
 
       overlays.default = final: prev: {
-        vim-kmein = prev.callPackage packages/vim { };
-        vimv = prev.callPackage packages/vimv.nix { };
-        ashell-kmein = import packages/ashell.nix {
+        niphas-terminal = prev.alacritty;
+        niphas-web-browser = prev.qutebrowser;
+        niphas-file-browser = prev.pcmanfm;
+        niphas-runner = prev.writers.writeDashBin "niphas-runner" "${prev.lib.getExe prev.rofi} -show run";
+        niphas-locker = prev.swaylock;
+
+        niphas-vim = prev.callPackage packages/vim { };
+        niphas-ashell = import packages/ashell.nix {
           inherit (inputs) wrappers;
           pkgs = prev;
         };
-        git-kmein = import packages/git.nix {
+        niphas-git = import packages/git.nix {
           inherit (inputs) wrappers;
           pkgs = prev;
         };
-        niri-kmein = import packages/niri {
+        niphas-niri = import packages/niri {
           inherit (inputs) wrappers;
           pkgs = final;
           lib = inputs.nixpkgs.lib;
         };
-        niri-wallpaper = prev.runCommand "niri-wallpaper.png" {
-          buildInputs = [ prev.imagemagick ];
-        } ''
-          # solid white
-          convert -size 1920x1080 xc:white $out
-        '';
+        niphas-wallpaper =
+          prev.runCommand "niphas-wallpaper.png"
+            {
+              buildInputs = [ prev.imagemagick ];
+            }
+            ''
+              # solid white
+              convert -size 1920x1080 xc:white $out
+            '';
+        vimv = prev.callPackage packages/vimv.nix { };
       };
 
       packages = eachSupportedSystem (
@@ -70,10 +79,10 @@
         in
         {
           inherit (pkgs)
-            ashell-kmein
-            git-kmein
-            niri-kmein
-            vim-kmein
+            niphas-ashell
+            niphas-git
+            niphas-niri
+            niphas-vim
             vimv
             ;
         }
diff --git a/modules/git.nix b/modules/git.nix
index d0b8bdd..a1cbc69 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -2,7 +2,7 @@
 {
   environment.shellAliases.g = "git";
   environment.systemPackages = [
-    pkgs.git-kmein
+    pkgs.niphas-git
     pkgs.git-absorb
     pkgs.git-crypt
     pkgs.git-lfs
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index 37069c0..bb628ca 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -11,10 +11,16 @@
     pkgs.libnotify
     pkgs.wdisplays
     pkgs.nsxiv
+
+    pkgs.niphas-file-browser
+    pkgs.niphas-terminal
+    pkgs.niphas-web-browser
+    pkgs.niphas-runner
+    pkgs.niphas-locker
   ];
 
   programs.niri = {
     enable = true;
-    package = pkgs.niri-kmein;
+    package = pkgs.niphas-niri;
   };
 }
diff --git a/modules/vim.nix b/modules/vim.nix
index 7d835da..5fe1459 100644
--- a/modules/vim.nix
+++ b/modules/vim.nix
@@ -1,11 +1,11 @@
 { lib, pkgs, ... }:
 {
-  environment.variables.EDITOR = lib.getExe pkgs.vim-kmein;
+  environment.variables.EDITOR = lib.getExe pkgs.niphas-vim;
   environment.shellAliases.vi = "nvim";
   environment.shellAliases.vim = "nvim";
   environment.shellAliases.view = "nvim -R";
 
   environment.systemPackages = [
-    pkgs.vim-kmein
+    pkgs.niphas-vim
   ];
 }
diff --git a/packages/ashell.nix b/packages/ashell.nix
index 3d13567..adced12 100644
--- a/packages/ashell.nix
+++ b/packages/ashell.nix
@@ -2,6 +2,7 @@
 let
   config = {
     clock.format = "%Y-%m-%d (%j %a %W) %H:%M";
+    appearance.scale_factor = 0.8;
     modules = {
       center = [ "Clock" ];
       left = [
diff --git a/packages/niri/default.nix b/packages/niri/default.nix
index 775457c..58d1b71 100644
--- a/packages/niri/default.nix
+++ b/packages/niri/default.nix
@@ -3,11 +3,6 @@
   pkgs,
   lib,
   screenshotPath ? null,
-  fileManager ? lib.getExe pkgs.pcmanfm,
-  browser ? lib.getExe pkgs.firefox,
-  terminal ? lib.getExe pkgs.alacritty,
-  runnerCommand ? "${lib.getExe pkgs.rofi} -show run",
-  locker ? lib.getExe pkgs.swaylock,
   geolocation ? [
     52.5244
     13.4105
@@ -64,14 +59,14 @@ let
             };
           };
           spawn-at-startup = [
-            (lib.getExe pkgs.ashell-kmein)
+            (lib.getExe pkgs.niphas-ashell)
           ]
           ++ lib.optional (pkgs ? niri-wallpaper) [
             (lib.getExe pkgs.swaybg)
             "--mode"
             "fill"
             "--image"
-            (toString pkgs.niri-wallpaper)
+            (toString pkgs.niphas-wallpaper)
           ]
           ++ lib.optional (geolocation != null) (
             let
@@ -95,11 +90,11 @@ let
             in
             {
               "Mod+Shift+Slash".show-hotkey-overlay = null;
-              "Mod+Y".spawn = browser;
-              "Mod+T".spawn = fileManager;
-              "Mod+Return".spawn = terminal;
-              "Mod+D".spawn-sh = runnerCommand;
-              "Mod+Shift+W".spawn = locker;
+              "Mod+Y".spawn = lib.getExe pkgs.niphas-web-browser;
+              "Mod+T".spawn = lib.getExe pkgs.niphas-file-browser;
+              "Mod+Return".spawn = lib.getExe pkgs.niphas-terminal;
+              "Mod+D".spawn = lib.getExe pkgs.niphas-runner;
+              "Mod+Shift+W".spawn = lib.getExe pkgs.niphas-locker;
 
               # TODO allow-when-locked
               "XF86AudioRaiseVolume".spawn-sh = "${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0";