home-manager/default.nix

@@ -27,6 +27,7 @@ in
       modules/foot.nix
       modules/manual.nix
       modules/tig.nix
+      modules/mako.nix
       modules/nm-applet.nix
       modules/blueman-applet.nix
       ../secrets/ssh-config.nix
@@ -77,6 +78,8 @@ in
       usbutils
       pciutils
 
+      swaylock
+      swayidle
       brightnessctl
       wl-clipboard
       sway-contrib.grimshot
@@ -129,26 +132,9 @@ in
 
     gtk = {
       enable = true;
-      font.name = "TeX Gyre Adventor 12";
       theme = {
-        name = "Juno";
+        name = "Adwaita";
-        package = pkgs.juno-theme;
+        package = pkgs.adwaita-icon-theme;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-
-      gtk3.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
-    };
-
-      gtk4.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
       };
     };
 

home-manager/modules/kanshi.nix

@@ -1,15 +1,12 @@
 { nixosConfig, ... }:
 let
   machines = {
-    smithers = [
+    smithers = [{
-      {
       profile.name = "laptop-only";
       profile.outputs = [
         {
           criteria = "eDP-1";
-            status = "enable";
           scale = 1.3;
-            mode = "2256x1504@59.999Hz";
         }
       ];
     }
@@ -21,20 +18,17 @@ let
             status = "disable";
           }
           {
-            criteria = "Samsung Electric Company U28E590 HTPJ109320";
+            criteria = "DP-10";
-            scale = 1.4;
+            scale = 1.3;
             position = "0,0";
-            mode = "3840x2160@60.000Hz";
           }
           {
-            criteria = "Samsung Electric Company U28E590 HTPM402579";
+            criteria = "DP-9";
-            scale = 1.4;
+            scale = 1.3;
-            position = "2743,0";
+            position = "2952,0";
-            mode = "3840x2160@60.000Hz";
-          }
-        ];
           }
         ];
+      }];
   };
 in
 {

home-manager/modules/mako.nix

@@ -0,0 +1,14 @@
+{
+  services.mako = {
+    enable = true;
+    groupBy = "app-name";
+    defaultTimeout = 5000;
+    extraConfig = ''
+      font=Inconsolata 10
+      background-color=#1d2021
+      border-color=#ebdbb2
+      border-radius=10
+      text-color=#ebdbb2
+    '';
+  };
+}

home-manager/modules/sway.nix

@@ -1,11 +1,6 @@
-{
+{ pkgs, nixosConfig, lib, ... }:
-  pkgs,
-  nixosConfig,
-  lib,
-  ...
-}:
 let
-  lockCmd = "${pkgs.gtklock}/bin/gtklock";
+  lockCmd = "${pkgs.swaylock}/bin/swaylock -i /etc/nixos/lockscreen.png";
 in
 {
   wayland.windowManager.sway = {
@@ -21,21 +16,17 @@ in
       focus.followMouse = false;
 
       input = {
-        "type:keyboard" = {
+        "type:keyboard" = { xkb_layout = "eu"; };
-          xkb_layout = "eu";
+        "type:mouse" = { pointer_accel = "-1"; };
-        };
+        "type:touchpad" = { tap = "enabled"; };
-        "type:mouse" = {
+        "1:1:AT_Translated_Set_2_keyboard" = {
-          pointer_accel = "-1";
+          # Remap borken ctrl key on internal keyboard for XPS
-        };
+          xkb_options = "caps:ctrl_modifier";
-        "type:touchpad" = {
-          tap = "enabled";
         };
       };
-      output =
+      output = {
-        {
         "*".bg = "/etc/nixos/wallpaper.jpg fill";
-        }
+      } // lib.optionalAttrs (nixosConfig.networking.hostName == "cray") {
-        // lib.optionalAttrs (nixosConfig.networking.hostName == "cray") {
         "DP-1" = {
           mode = "3840x2160";
           scale = "1.3";
@@ -46,11 +37,15 @@ in
           scale = "1.3";
           position = "2953,0";
         };
+      } // lib.optionalAttrs (nixosConfig.networking.hostName == "smithers") {
+        "eDP-1" = {
+          mode = "2256x1504";
+          scale = "1.2";
+          position = "0,0";
+        };
       };
 
-      gaps = {
+      gaps = { inner = 5; };
-        inner = 5;
-      };
       window.border = 2;
       window.hideEdgeBorders = "smart";
       workspaceAutoBackAndForth = true;
@@ -94,13 +89,12 @@ in
         };
       };
 
+
       bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
 
       startup = [
-        { command = "${pkgs.swaynotificationcenter}/bin/swaync"; }
         {
-          command = ''
+          command = ''${pkgs.swayidle}/bin/swayidle -w \
-            ${pkgs.swayidle}/bin/swayidle -w \
                            timeout 600 "${lockCmd}" \
                            timeout 900 "${pkgs.sway}/bin/swaymsg output * dpms off" \
                                 resume "${pkgs.sway}/bin/swaymsg output * dpms on" \
@@ -108,6 +102,8 @@ in
         }
       ];
 
+
+
       keybindings =
         let
           mod = "Mod4";
@@ -116,14 +112,13 @@ in
         in
         {
           "${mod}+Return" = "exec foot";
-          "${mod}+p" = "exec ${pkgs.nwg-drawer}/bin/nwg-drawer";
+          "${mod}+p" = "exec ${pkgs.wofi}/bin/wofi --show drun --gtk-dark";
 
           "${mod}+Shift+c" = "reload";
           "${mod}+Shift+q" = "kill";
           "${mod}+Shift+e" =
             "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
           "${mod}+x" = "move workspace to output right";
-          "${mod}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t";
 
           "${mod}+h" = "focus left";
           "${mod}+j" = "focus down";
@@ -170,11 +165,14 @@ in
           # Print, Pause, AudioRaiseVolume
           "Print" = "exec grimshot save area";
           "Pause" = "exec systemctl suspend";
-          "XF86AudioRaiseVolume" = "exec ${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
+          "XF86AudioRaiseVolume" =
+            "exec ${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
           # Tools, AudioMute, AudioLowerVolume
           "XF86Tools" = "exec ${lockCmd}";
-          "XF86AudioMute" = "exec ${pactl} set-sink-mute @DEFAULT_SINK@ toggle";
+          "XF86AudioMute" =
-          "XF86AudioLowerVolume" = "exec ${pactl} set-sink-volume @DEFAULT_SINK@ -5%";
+            "exec ${pactl} set-sink-mute @DEFAULT_SINK@ toggle";
+          "XF86AudioLowerVolume" =
+            "exec ${pactl} set-sink-volume @DEFAULT_SINK@ -5%";
 
           # AudioPrev, AudioPlay, AudioNext
           "XF86AudioNext" = "exec ${playerctl} next";

modules/sway.nix

@@ -3,8 +3,6 @@
   programs.sway.enable = true;
   programs.sway.package = null;
 
-  security.pam.services.gtklock = {};
-
   # autologin
   services.greetd = {
     enable = true;