From 6c0aa6cf9b8c802cd40f75d3e14f1fce2d306d3d Mon Sep 17 00:00:00 2001
From: alisceon <alisceon@protonmail.com>
Date: Mon, 19 Jan 2026 18:22:45 +0100
Subject: [PATCH] minutiae

---
 home/alisceon/base.nix       | 24 ++++++------
 home/wm/sway.nix             | 75 ++++++++++++++++++++++--------------
 hosts/common/stylix.nix      | 30 +++------------
 hosts/common/wm/sway.nix     |  2 -
 hosts/common/workstation.nix |  9 +++++
 5 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/home/alisceon/base.nix b/home/alisceon/base.nix
index 17e55bd..5174056 100644
--- a/home/alisceon/base.nix
+++ b/home/alisceon/base.nix
@@ -2,21 +2,21 @@
   let
     # Universal shell abbreviations
     baseAbbrs = {
-          tsla-fan = "ipmitool -H 10.30.0.3 -U ADMIN -P ADMIN raw 0x30 0x70 0x66 0x01 0x0";
+      tsla-fan = "ipmitool -H 10.30.0.3 -U ADMIN -P ADMIN raw 0x30 0x70 0x66 0x01 0x0";
 
-          # NixOS commands
-          nixoss = "sudo nixos-rebuild switch --flake .#${hostName}";
-          nixost = "sudo nixos-rebuild test --flake .#${hostName}";
-          nixosdb = "sudo nixos-rebuild dry-build --flake .#${hostName}";
+      # NixOS commands
+      nixoss = "sudo nixos-rebuild switch --flake .#${hostName}";
+      nixost = "sudo nixos-rebuild test --flake .#${hostName}";
+      nixosdb = "sudo nixos-rebuild dry-build --flake .#${hostName}";
 
-          # Development commands
-          devt = "devenv test";
+      # Development commands
+      devt = "devenv test";
 
-          devtas = "devenv tasks list";
-          devtar = "devenv tasks run";
-          devs = "devenv shell";
-          devu = "devenv up -d";
-          devi-python = "nix flake init -t templates#python";
+      devtas = "devenv tasks list";
+      devtar = "devenv tasks run";
+      devs = "devenv shell";
+      devu = "devenv up -d";
+      devi-python = "nix flake init -t templates#python";
     }; # end globalShellAbbrs
     # Tower specific abbreviations
     hostnameAbbrs = 
diff --git a/home/wm/sway.nix b/home/wm/sway.nix
index a917d0d..aa51c71 100644
--- a/home/wm/sway.nix
+++ b/home/wm/sway.nix
@@ -1,12 +1,13 @@
 { pkgs, config, hostName, lib, ... }:
   let
     # execs
+    uwsm = "${pkgs.uwsm}/bin/uwsm-app --";
     swaymsg = "${pkgs.sway}/bin/swaymsg";
     lock = "${pkgs.swaylock}/bin/swaylock --daemonize";
     term = "${pkgs.kitty}/bin/kitty";
-    dmenu = "${pkgs.rofi}/bin/rofi -show drun";
     notify = "${pkgs.libnotify}/bin/notify-send";
     nag = "${pkgs.sway}/bin/swaynag --edge bottom";
+    dmenu = "${pkgs.rofi-unwrapped}/bin/rofi";
 
     # keybinds
     key_mod = "Mod4";
@@ -110,11 +111,9 @@
       modifier = "${key_mod}";
       startup = [
         { command = "systemctl --user start libinput-gestures"; }
-        { command = "swaybg -m fill -i /home/alisceon/Pictures/system/bg.png";} 
-      ];
-      bars = [
-        { command = "${pkgs.waybar}/bin/waybar"; }
+        { command = ''${uwsm} swaybg -m fill -i /home/alisceon/Pictures/system/bg.png'';}
       ];
+      bars = [ ];
       input = {
         "type:touchpad" = {
           dwt = "enabled";
@@ -196,19 +195,20 @@
         "Mod4+space" = ''exec ${notify} -t 2000 "$(xonsh ~/.nixos_config/util/get_xkb.xsh)"'';
         "${key_mod}+Shift+r" = "reload";
         "${key_mod}+Ctrl+r" = "restart";
-        "${key_mod}+Escape" = "exec ${nag} -m 'Shutdown options:' -Z 'Power Off' 'systemctl poweroff' -Z 'Reboot' 'systemctl reboot' -Z 'Logout' 'swaymsg exit'";
         "${key_mod}+Shift+Backspace" = "exec ${nag} -m 'TuneD profiles:' -Z 'Performance' 'tuned-adm profile accelerator-performance' -Z 'Balanced' 'tuned-adm profile balanced' -Z 'Power Save' 'tuned-adm profile powersave'";
-        "${key_mod}+Return" = "exec ${term}";
         "${key_mod}+Shift+q" = "kill";
         "Alt+F4" = "kill";
 
         # Locking and idle
         "${key_mod}+L" = "exec ${lock}";
+        "${key_mod}+Escape" = "exec ${nag} -m 'Shutdown options:' -Z 'Power Off' 'systemctl poweroff' -Z 'Reboot' 'systemctl reboot' -Z 'Logout' 'swaymsg exit'";
 
         # Apps
-        "${key_mod}+d" = "exec ${dmenu}";
+        "${key_mod}+Return" = ''exec "${uwsm} ${term}"'';
+        "${key_mod}+d" = ''exec "${uwsm} ${dmenu} -show drun"'';
+        
 
-        #Screenshot region
+        # Screenshot region
         "${key_mod}+Shift+s" = "exec grimshot savecopy area";
         "${key_mod}+Ctrl+s" = "exec grimshot savecopy output";
 
@@ -270,14 +270,20 @@
   programs = {
     rofi = {
       enable = true;
+      package = pkgs.rofi-unwrapped;
+      terminal = term;
     }; # end rofi
     waybar = {
       enable = true;
+      systemd = {
+        enable = true;
+        target = "graphical-session.target";
+      };
       settings = {
         mainBar = {
           layer = "bottom";
           position = "top";
-          height = 32;
+          height = 28;
           spacing = 0;
           modules-left = [
             "sway/workspaces"
@@ -291,6 +297,7 @@
             "network"
             "pulseaudio"
             "battery"
+            "sway/language"
             "clock"
           ];
           "sway/workspaces" = {
@@ -306,47 +313,59 @@
             spacing = 8;
           };
           "idle_inhibitor" = {
-            format = "| {icon} ";
+            format = "| {icon}";
+            start-activated = true;
             format-icons = {
-              activated = "OuO";
-              deactivated = "=w=";
+              activated = "🫨";
+              deactivated = "😴";
             };
           };
+          "sway/language" = {
+            format = "| {flag}";
+          };
           "clock" = {
             interval = 60;
             tooltip = true;
-            format = "| {:%Y-%m-%d  %R} ";
+            format = "| {:%Y-%m-%d %R}";
             tooltip-format = "{:%A}";
           };
           "battery" = {
+            interval = 60;
+            format = "| {icon}{capacity}%";
+            format-charging = "| {icon}⚡{capacity}%";
+            format-plugged = "| {icon}🔌{capacity}%";
             states = {
               critical = 10;
               warning = 20;
-              good = 90;
+              good = 100;
               full = 100;
               over = 101;
             };
-            interval = 30;
-            format = "| Bat {capacity}% ";
-            format-charging = "| Chr {capacity}% ";
-            format-plugged = "| Plg {capacity}% ";
+            format-icons = [ "🪫" "🪫" "🔋" "🔋" "🔋"];
           };
           "network" = {
-            format-wifi = "| WiFi up ";
-            format-ethernet = "";
             tooltip-format = "{ifname} = {ipaddr}/{cidr}";
-            format-linked = "| {ifname} (no ip) ";
-            format-disconnected = "| Disconnected ";
-            format-alt = "| {essid}: {ipaddr} ";
-            interval = 10;
+            format-wifi = "| ᯤ";
+            format-ethernet = "| ⇄";
+            format-linked = "| 🔗";
+            format-disconnected = "| ⛓️‍💥";
+            format-alt = "| {essid}: {ipaddr}";
+            interval = 15;
           };
           "pulseaudio" = {
-            # "scroll-step" = 1; # %; can be a float
-            format = "| Sound: {volume}% ";
-            format-muted = "| Sound: x% ";
+            format = "| 🔊{volume}%";
+            format-muted = "| 🔈0%";
+            format-bluetooth = "| 🎧{volume}%";
           };
         }; # end mainbar
       }; # end settings
+      style = ''
+        button {
+          box-shadow: inset 0 -8px transparent;
+          border: none;
+          border-radius: 0;
+        }
+      ''; # end style
     }; # end waybar
     swaylock = {
       enable = true;
diff --git a/hosts/common/stylix.nix b/hosts/common/stylix.nix
index 1def67d..029a6ac 100644
--- a/hosts/common/stylix.nix
+++ b/hosts/common/stylix.nix
@@ -4,28 +4,8 @@ stylix = {
     enable = true;
     autoEnable = true;
     enableReleaseChecks = false;
-    base16Scheme = {
-      scheme = "My Custom Theme";
-      author = "you";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/selenized-black.yaml";
 
-      base00 = "#0f0f14";
-      base01 = "#16161e";
-      base02 = "#1f1f2a";
-      base03 = "#2a2a37";
-      base04 = "#a0a0b0";
-      base05 = "#c0c0d0";
-      base06 = "#e0e0f0";
-      base07 = "#ffffff";
-
-      base08 = "#f7768e"; # red
-      base09 = "#ff9e64"; # orange
-      base0A = "#e0af68"; # yellow
-      base0B = "#9ece6a"; # green
-      base0C = "#7dcfff"; # cyan
-      base0D = "#7aa2f7"; # blue
-      base0E = "#bb9af7"; # purple
-      base0F = "#db4b4b"; # brown
-    };
     polarity = "dark";
     fonts = {
       monospace = {
@@ -33,12 +13,12 @@ stylix = {
         name = "Inconsolata";
       };
       sansSerif = {
-        package = pkgs.inter;
-        name = "Inter";
+        package = pkgs.noto-fonts;
+        name = "NotoSans";
       };
       serif = {
-        package = pkgs.source-serif;
-        name = "Source Serif 4";
+        package = pkgs.noto-fonts;
+        name = "NotoSerif";
       };
       emoji = {
         package = pkgs.noto-fonts-color-emoji;
diff --git a/hosts/common/wm/sway.nix b/hosts/common/wm/sway.nix
index 27ef821..394780b 100644
--- a/hosts/common/wm/sway.nix
+++ b/hosts/common/wm/sway.nix
@@ -40,10 +40,8 @@
         pulseaudio # pulseaudio support
         sway-contrib.grimshot # screenshot tool
         kitty # terminal emulator
-        kitty-themes
         dotool # tool to send keyboard/mouse input to wayland apps
         mako # notification system developed by swaywm maintainer
-        rofi # application launcher
       ];
     }; # end sway
     uwsm = { # responsible for creating xdg-portal and systemd insteraction for sway
diff --git a/hosts/common/workstation.nix b/hosts/common/workstation.nix
index 271e205..223638a 100644
--- a/hosts/common/workstation.nix
+++ b/hosts/common/workstation.nix
@@ -1,6 +1,14 @@
 { config, pkgs, pkgs-unstable, ... }:
 
 {
+  boot = {
+    plymouth.enable = true;
+    kernelParams = [
+      "quiet"
+      "udev.log_level=3"
+      "systemd.show_status=auto"
+    ];
+  };
   security.sudo.wheelNeedsPassword = false;
 
   services = {
@@ -66,6 +74,7 @@
       pkgs.gparted
       pkgs.vlc
       pkgs.via
+      pkgs.plymouth
     ]; # end systemPackages
   sessionVariables.NIXOS_OZONE_WL = "1";
   }; # end environment