misc: Fix display scaling on athena, various tweaks

5 files changed, 29 insertions, 15 deletions

diff --git a/gui/conf/init.el b/gui/conf/init.el
index d63d3f7..d4af44c 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -24,9 +24,9 @@
 
 (defun startup (frame)
   (select-frame frame)
-  (set-frame-font "Iosevka 10" nil t)
+  (set-frame-font "Iosevka 11" nil t)
   (set-fontset-font "fontset-default" 'unicode "Iosevka")
-  (set-face-font 'default "Iosevka 10")
+  (set-face-font 'default "Iosevka 11")
   ;(set-fontset-font t 'unicode (font-spec :name "Symbola") nil 'append)
   (menu-bar-mode -1)
   (toggle-scroll-bar -1)
diff --git a/gui/conf/niri.kdl b/gui/conf/niri.kdl
index 89d08bd..b3e0e1f 100644
--- a/gui/conf/niri.kdl
+++ b/gui/conf/niri.kdl
@@ -7,6 +7,11 @@ environment {
 
 prefer-no-csd
 
+output "eDP-1" {
+    mode "1920x1080"
+    scale 1
+}
+
 input {
     keyboard {
         xkb {
@@ -105,12 +110,17 @@ window-rule {
 }
 
 binds {
-    F1 { show-hotkey-overlay; }
+    Mod+F1 { show-hotkey-overlay; }
+
+    Mod+F9 { spawn "bash" "-c" "notify-send \"Battery `acpi | cut -c 10-`\""; }
+    Mod+F10 { spawn "bash" "-c" "notify-send \"Running at `acpi --thermal | awk '{print $4}'`°C cooled by `cat /proc/acpi/ibm/fan | awk '/speed/{print $2}'` RPM\""; }
 
-    Mod+Return hotkey-overlay-title="Open Terminal" { spawn "kitty"; }
-    Mod+Shift+Return hotkey-overlay-title="Open Emacs" { spawn "emacsclient" "-c"; }
-    Mod+Space hotkey-overlay-title="Run an Application: rofi" { spawn "rofi" "-show" "combi"; }
-    Ctrl+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock" "--color" "#000000"; }
+    Mod+Return { spawn "kitty"; }
+    Mod+Shift+Return { spawn "emacsclient" "-c"; }
+    Mod+Space { spawn "rofi" "-show" "combi"; }
+    Ctrl+Alt+L { spawn "swaylock" "--color" "#000000"; }
+
+    Mod+P { spawn "passrofi"; }
 
     XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; }
     XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; }
@@ -154,8 +164,8 @@ binds {
 
     Mod+U              { focus-workspace-down; }
     Mod+I              { focus-workspace-up; }
-    Mod+Shift+U         { move-workspace-down; }
-    Mod+Shift+I         { move-workspace-up; }
+    //Mod+Shift+U         { move-workspace-down; }
+    //Mod+Shift+I         { move-workspace-up; }
 
     //Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
     //Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
@@ -242,6 +252,7 @@ binds {
     Mod+R { switch-preset-column-width; }
     Mod+Shift+R { switch-preset-window-height; }
     Mod+Ctrl+R { reset-window-height; }
+
     Mod+F { maximize-column; }
     Mod+Shift+F { fullscreen-window; }
 
diff --git a/gui/dunst.nix b/gui/dunst.nix
index a75b56d..79e5061 100644
--- a/gui/dunst.nix
+++ b/gui/dunst.nix
@@ -10,15 +10,16 @@
     enable = true;
     settings = {
       global = {
-        width = 300;
-        height = 50;
-        offset = "5x5";
+        notification_limit = 5;
+        width = "(0, 800)";
+        height = 40;
+        offset = "6x6";
         origin = "bottom-right";
         transparency = 10;
         frame_color = "#909737";
         background = "#909737";
         foreground = "#111111";
-        font = "Iosevka 11";
+        font = "Iosevka 10";
       };
     };
   };
diff --git a/gui/pass.nix b/gui/pass.nix
index 9edd5a8..50bfc31 100644
--- a/gui/pass.nix
+++ b/gui/pass.nix
@@ -4,11 +4,11 @@ let
   emumenu = pkgs.writeTextFile {
     name        = "emumenu";
     executable  = true;
-    destination = "/bin/dmenu";
+    destination = "/bin/dmenu-wl";
 
     text = ''
       #!/usr/bin/env bash
-      ${pkgs.rofi}/bin/rofi -dmenu -p "pass" "$@"
+      ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "pass" "$@"
     '';
   };
 
@@ -27,6 +27,7 @@ let
 in {
   home.packages = [
     pkgs.pass
+    pkgs.ydotool
     passrofi
   ];
 }
diff --git a/host/athena.nix b/host/athena.nix
index 556893e..0e310ca 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -12,6 +12,7 @@
     brightnessctl
     blueman
     xwayland-satellite
+    moonlight-qt
   ];
 
   home.sessionVariables = {