Merge remote-tracking branch 'origin/main'

modules/home-manager/mako.nix

@@ -6,21 +6,23 @@
   services.mako = with colors.withHashPrefix; {
     enable = false;
 
-    borderSize = 1;
-    maxVisible = 5;
-    defaultTimeout = 15000;
-    font = "Symbols Nerd Font ${toString font.size},${font.name} ${toString font.size}";
-    # TODO: config
-
-    backgroundColor = bg;
-    textColor = text;
-    borderColor = primary;
-    progressColor = primary;
     anchor = "top-right";
 
     extraConfig = ''
+      border-size=1
+      max-visible=5
+      default-timeout=15000
+      font=Symbols Nerd Font ${toString font.size},${font.name} ${toString font.size}
+      anchor=top-right
+
+      background-color=${colors.bg}
+      text-color=${colors.text}
+      border-color=${colors.primary}
+      progress-color=${colors.primary}
+
       [urgency=high]
       border-color=${urgent}
+
       [urgency=high]
       background-color=${urgent}
       border-color=${urgent}

modules/home-manager/sway.nix

@@ -3,7 +3,7 @@
   lib,
   config,
   pkgs,
-  # font,
+  font,
   ...
 }: {
   imports = [
@@ -17,6 +17,30 @@
     enable = true;
   };
 
+  home.file."${config.xdg.configHome}/mako/config" = {
+    enable = true;
+    text = with colors.withHashPrefix; ''
+      border-size=1
+      max-visible=5
+      default-timeout=15000
+      font=Symbols Nerd Font ${toString font.size},${font.name} ${toString font.size}
+      anchor=top-right
+
+      background-color=${bg}
+      text-color=${text}
+      border-color=${primary}
+      progress-color=${primary}
+
+      [urgency=high]
+      border-color=${urgent}
+
+      [urgency=high]
+      background-color=${urgent}
+      border-color=${urgent}
+      text-color=${bg}
+    '';
+  };
+
   home.file."${config.xdg.configHome}/tofi/config" = {
     enable = true;
     text = ''
@@ -141,7 +165,6 @@
         # {command = "mako";}
         # {command = "firefox";}
         # {command = "wezterm";}
-        {command = "wezterm";}
       ];
 
       modes = {

modules/nixos/gnome.nix

@@ -5,10 +5,16 @@
 }: {
   imports = [./pipewire.nix];
 
+  # mkForce is used liberally to take precedence over KDE Plasma
+  # so I can have both "usable" at once
+
   services.xserver.enable = lib.mkDefault true;
   services.xserver.displayManager.gdm = {
-    enable = lib.mkDefault true;
+    enable = lib.mkForce true; # take precedence over KDE's SDDM
   };
+  services.displayManager.execCmd = lib.mkForce "exec ${pkgs.gnome.gdm}/bin/gdm";
+  services.displayManager.defaultSession = lib.mkForce "gnome";
+  programs.ssh.askPassword = "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";
 
   hardware.pulseaudio.enable = false;
 

nixos/foxtrot.nix

@@ -5,7 +5,7 @@
   pkgs,
   ...
 }: let
-  scale = 1.25;
+  scale = 1.5;
 in {
   networking.hostName = "foxtrot";
 
@@ -28,7 +28,7 @@ in {
     lutris
     postgres
     wifi
-    hyprland
+    # hyprland
     steam
     {
       # laptop power management
@@ -94,7 +94,7 @@ in {
       pass
       firefox-no-tabs
       # wallpaper-manager
-      hyprland
+      # hyprland
     ];
     home = {
       stateVersion = "24.05";