Add niri config, restructure files

Move sway to desktop/sway and move other packages under programs/sway
up a level to programs/desktop, add niri config to desktop/niri and
refactor common desktop imports into desktop/default.nix that also
imports (for now at least) sway and niri modules

Move wallpapers into programs/desktop since that's where they're
needed anyway

Add helper script to call swaybg with arguments

home/default.nix

@@ -6,7 +6,7 @@
 }: {
   imports = [
     # Programs
-    ../programs/sway/default.nix
+    ../programs/desktop/default.nix
     ../programs/shell/default.nix
     ../programs/emacs/default.nix
     ../programs/nyxt/default.nix

programs/desktop/alacritty/default.nix

@@ -13,7 +13,6 @@
           };
         };
         window = {
-          opacity = 0.9;
           dynamic_title = true;
           padding = {
             x = 10;

programs/desktop/default.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./sway/default.nix
+    ./niri/default.nix
+    ./foot/default.nix
+    ./alacritty/default.nix
+    ./avizo/default.nix
+    ./fuzzel/default.nix
+    ./swaylock/default.nix
+    ./swayidle/default.nix
+    ./swaync/default.nix
+    ./waybar/default.nix
+    ./wlogout/default.nix
+  ];
+  home.packages = with pkgs; [
+    swaybg
+    (writeShellScriptBin "set-background" "${swaybg}/bin/swaybg -m fill -i ${./wallpapers/default.jpg}")
+    (writeShellScriptBin "protonmail-setup-bridge" ''
+      pkill -9 -f protonmail-bridge
+      ${protonmail-bridge}/bin/protonmail-bridge -c
+      swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
+    '')
+    (writeShellScriptBin "davmail-setup" ''
+      systemctl --user restart davmail # Ensure config file is present
+      systemctl --user stop davmail
+      ${davmail}/bin/davmail -n ~/.davmail.properties
+      systemctl --user restart davmail
+    '')
+  ];
+}

programs/desktop/foot/default.nix

@@ -8,12 +8,9 @@
     server.enable = true;
     settings = {
       main = {
-        # term = "xterm-256color";
-        # title = "foot";
         locked-title = false;
         font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
         dpi-aware = false;
-        pad = "10x10";
       };
       bell = {
         urgent = false;
@@ -23,7 +20,6 @@
       cursor = {blink = true;};
       mouse = {hide-when-typing = true;};
       colors = with config.scheme; rec {
-        alpha = 0.9;
         background = base00;
         foreground = base05;
         regular0 = base02;

programs/desktop/fuzzel/default.nix

@@ -27,7 +27,7 @@
         layer = "overlay";
       };
       colors = with config.scheme; {
-        background = "${base00}5A"; # 90% opacity
+        background = "${base00}FF";
         text = "${base05}FF";
         match = "${red}FF";
         selection = "${base01}FF";

programs/desktop/niri/config.kdl

@@ -0,0 +1,184 @@
+input {
+    keyboard {
+        xkb {
+            layout "gb"
+            options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
+        }
+    }
+    touchpad {
+        tap
+        natural-scroll
+    }
+    warp-mouse-to-focus
+}
+
+layout {
+    gaps 16
+    center-focused-column "never"
+    preset-column-widths {
+        proportion 0.5
+        proportion 0.75
+    }
+    default-column-width { proportion 0.75; }
+    focus-ring {
+        off
+        width 1
+        active-color "#7fc8ff"
+        inactive-color "#505050"
+    }
+    border {
+        off
+        width 1
+        active-color "#ffc87f"
+        inactive-color "#505050"
+    }
+    struts {
+        left 64
+        right 64
+    }
+}
+
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+
+binds {
+    Mod+Shift+Slash { show-hotkey-overlay; }
+    Mod+Return { spawn "foot"; }
+    Mod+Shift+Return { spawn "fuzzel"; }
+    Mod+E { spawn "emacsclient" "-c"; }
+    Mod+P { spawn "wlogout"; }
+
+    Mod+Z { spawn "swaync-client" "-t" "-sw"; }
+    Mod+Shift+Z { spawn "swaync-client" "-d" "-sw"; }
+
+    Super+Alt+L { spawn "swaylockfx"; }
+
+    XF86AudioRaiseVolume allow-when-locked=true { spawn "volumectl" "-u" "+" "5"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn "volumectl" "-u" "-" "5"; }
+    XF86AudioMute        allow-when-locked=true { spawn "volumectl" "%"; }
+    XF86AudioMicMute     allow-when-locked=true { spawn "volumectl" "-m" "%"; }
+
+    XF86MonBrightnessUp   allow-when-locked=true { spawn "lightctl" "+" "5"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "lightctl" "-" "5"; }
+
+    XF86AudioPlay     allow-when-locked=true { spawn "playerctl" "play-pause"; }
+    XF86AudioStop     allow-when-locked=true { spawn "playerctl" "play-pause"; }
+    XF86AudioPrevious allow-when-locked=true { spawn "playerctl" "previous"; }
+    XF86AudioNext     allow-when-locked=true { spawn "playerctl" "next"; }
+
+    Mod+Q { close-window; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    Mod+Comma  { consume-window-into-column; }
+    Mod+Period { expel-window-from-column; }
+
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    Mod+R { switch-preset-column-width; }
+    Mod+Shift+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+    Mod+C { center-column; }
+
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    Mod+Shift+E { quit; }
+
+    Mod+Shift+P { power-off-monitors; }
+}

programs/desktop/niri/default.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}: {
+  xdg.configFile."niri/config.kdl".source = ./config.kdl;
+  home.packages = with pkgs; [playerctl];
+}

programs/desktop/sway/default.nix

@@ -6,31 +6,6 @@
   accentColour ? "base07",
   ...
 }: {
-  imports = [
-    ./foot/default.nix
-    ./alacritty/default.nix
-    ./avizo/default.nix
-    ./fuzzel/default.nix
-    ./swaylock/default.nix
-    ./swayidle/default.nix
-    ./swaync/default.nix
-    ./waybar/default.nix
-    ./wlogout/default.nix
-  ];
-  home.packages = with pkgs; [
-    swaybg
-    (writeShellScriptBin "protonmail-setup-bridge" ''
-      pkill -9 -f protonmail-bridge
-      ${protonmail-bridge}/bin/protonmail-bridge -c
-      swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
-    '')
-    (writeShellScriptBin "davmail-setup" ''
-      systemctl --user restart davmail # Ensure config file is present
-      systemctl --user stop davmail
-      ${davmail}/bin/davmail -n ~/.davmail.properties
-      systemctl --user restart davmail
-    '')
-  ];
   wayland.windowManager.sway = {
     enable = true;
     package =
@@ -98,7 +73,7 @@
       startup = [
         {command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";}
         {command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n";}
-        {command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${../../wallpapers/default.jpg}";}
+        {command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${.wallpapers/default.jpg}";}
       ];
       window = {
         border = 1;

programs/desktop/swaync/default.nix

@@ -19,7 +19,7 @@
       border-radius: 10px;
       border: 1px solid ${withHashtag.${accentColour}};
       margin: 18px;
-      background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.9);
+      background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 1.0);
       color: ${withHashtag.base05};
       padding: 0;
     }