zaphyra's git: nixfiles

some cleanups

diff --git a/config/home-manager/zaphyra/configure/niri.nix b/config/home-manager/zaphyra/configure/niri.nix
@@ -25,8 +25,8 @@ in
     services.wlsunset
     services.playerctl
 
-    programs.ghostty
     programs.fuzzel
+    programs.ghostty
     programs.sherlock
     programs.overskride
   ];

diff --git a/config/home-manager/zaphyra/programs/alacritty.nix b/config/home-manager/zaphyra/programs/alacritty.nix
@@ -49,11 +49,6 @@
     };
   };
 
-  wayland.windowManager.sway = {
-    config.terminal = "${pkgs.alacritty}/bin/alacritty";
-    extraConfig = ''
-      exec swaymsg 'workspace 3: Term; exec ${pkgs.alacritty}/bin/alacritty; exec ${pkgs.alacritty}/bin/alacritty; workspace 1: Web;'
-    '';
-  };
+  wayland.windowManager.sway.config.terminal = "${pkgs.alacritty}/bin/alacritty";
 
 }

diff --git a/config/home-manager/zaphyra/programs/blueman.nix b/config/home-manager/zaphyra/programs/blueman.nix
@@ -2,8 +2,6 @@
 
 {
 
-  home.packages = [
-    pkgs.blueman
-  ];
+  home.packages = [ pkgs.blueman ];
 
 }

diff --git a/config/home-manager/zaphyra/programs/cozy.nix b/config/home-manager/zaphyra/programs/cozy.nix
@@ -2,8 +2,6 @@
 
 {
 
-  home.packages = with pkgs; [
-    cozy
-  ];
+  home.packages = [ pkgs.cozy ];
 
 }

diff --git a/config/home-manager/zaphyra/programs/gnome-obfuscate.nix b/config/home-manager/zaphyra/programs/gnome-obfuscate.nix
@@ -2,8 +2,6 @@
 
 {
 
-  home.packages = with pkgs; [
-    gnome-obfuscate
-  ];
+  home.packages = [ pkgs.gnome-obfuscate ];
 
 }

diff --git a/config/home-manager/zaphyra/programs/gnome-text-editor.nix b/config/home-manager/zaphyra/programs/gnome-text-editor.nix
@@ -2,9 +2,7 @@
 
 {
 
-  home.packages = with pkgs; [
-    gnome-text-editor
-  ];
+  home.packages = [ pkgs.gnome-text-editor ];
 
   dconf.settings = {
     "org/gnome/TextEditor" = {

diff --git a/config/home-manager/zaphyra/programs/gpg.nix b/config/home-manager/zaphyra/programs/gpg.nix
@@ -19,10 +19,6 @@
     };
   };
 
-  wayland.windowManager.sway.extraConfig = ''
-    exec_always 'gpgconf --kill gpg-agent'
-  '';
-
   programs = {
     gpg = {
       enable = true;

diff --git a/config/home-manager/zaphyra/programs/thunderbird.nix b/config/home-manager/zaphyra/programs/thunderbird.nix
@@ -28,13 +28,6 @@
     Install.WantedBy = [ "graphical-session.target" ];
   };
 
-  wayland.windowManager.sway.config.startup = [
-    {
-      always = true;
-      command = "systemctl --user restart thunderbird";
-    }
-  ];
-
   xdg = {
     enable = true;
     mime.enable = true;

diff --git a/config/home-manager/zaphyra/services/easyeffects.nix b/config/home-manager/zaphyra/services/easyeffects.nix
@@ -18,11 +18,4 @@
     Install.WantedBy = [ "graphical-session.target" ];
   };
 
-  wayland.windowManager.sway.config.startup = [
-    {
-      always = true;
-      command = "systemctl --user restart easyeffects";
-    }
-  ];
-
 }

diff --git a/config/home-manager/zaphyra/services/mako.nix b/config/home-manager/zaphyra/services/mako.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
 

@@ -22,7 +22,7 @@
     Unit.PartOf = [ "graphical-session.target" ];
 
     Service = {
-      ExecStart = "${pkgs.mako}/bin/mako";
+      ExecStart = lib.getExe pkgs.mako;
       Restart = "always";
       RestartSec = 5;
     };

@@ -30,11 +30,4 @@
     Install.WantedBy = [ "graphical-session.target" ];
   };
 
-  wayland.windowManager.sway.config.startup = [
-    {
-      always = true;
-      command = "systemctl --user restart mako";
-    }
-  ];
-
 }

diff --git a/config/home-manager/zaphyra/services/niri.nix b/config/home-manager/zaphyra/services/niri.nix
@@ -152,8 +152,8 @@
 
       binds = with config.lib.niri.actions; {
         "Mod+Shift+E".action = quit;
-        "Mod+Return".action = spawn (lib.getExe pkgs.ghostty);
         "Mod+Space".action = lib.mkDefault (spawn (lib.getExe pkgs.fuzzel));
+        "Mod+Return".action = lib.mkDefault (spawn config.home.sessionVariables.TERMINAL);
 
         "Mod+L".action = spawn (lib.getExe' pkgs.systemd "loginctl") "lock-session";
         "Mod+Z".action = power-off-monitors;

diff --git a/config/home-manager/zaphyra/services/owntone.nix b/config/home-manager/zaphyra/services/owntone.nix
@@ -46,16 +46,12 @@
       StartLimitBurst = 5;
       StartLimitIntervalSec = 10;
     };
-
     Service = {
       ExecStart = "${lib.getExe pkgs.owntone} -f -c ${configFile}";
       Restart = "on-failure";
       RestartSec = 5;
     };
-
-    Install = {
-      WantedBy = [ "graphical-session.target" ];
-    };
+    Install.WantedBy = [ "graphical-session.target" ];
   };
 
 } 
\ No newline at end of file

diff --git a/config/home-manager/zaphyra/services/swaync.nix b/config/home-manager/zaphyra/services/swaync.nix
@@ -1,4 +1,4 @@
-  {
+{
   config,
   lib,
   pkgs,

@@ -208,7 +208,7 @@
         background: rgba(255, 255, 255, 0.1);
       }
 
-        /* Sliders */
+      /* Sliders */
       scale {
         padding: 0px;
         margin: 0px 5px 0px 5px;

diff --git a/config/home-manager/zaphyra/services/waybar.nix b/config/home-manager/zaphyra/services/waybar.nix
@@ -8,13 +8,6 @@
 
 {
 
-  wayland.windowManager.sway.config.startup = [
-    {
-      always = true;
-      command = "systemctl --user restart waybar";
-    }
-  ];
-
   imports = with homeManagerModules.zaphyra; [
     programs.networkManagerDmenu
   ];

diff --git a/config/nixos/modules/presets/zaphyra/dn42.nix b/config/nixos/modules/presets/zaphyra/dn42.nix
@@ -95,7 +95,6 @@ in
       ''
     ];
 
-
     environment.etc."whois.conf".text = ''
       \.dn42$           whois.dn42
       \-DN42$           whois.dn42

diff --git a/flake.nix b/flake.nix
@@ -59,8 +59,6 @@
 
       homeManagerModules = loadDir pathLoader ./config/home-manager;
 
-      lib = loadDir (path: path: import path inputs) ./lib;
-
       overlays = (loadDir importLoader ./overlays) // {
         nixpkgsUnstable = final: prev: { unstable = inputs.nixpkgsUnstable.legacyPackages.${prev.system}; };
         sherlock = final: prev: { sherlock-launcher = inputs.sherlock.packages.${prev.system}.default; };

@@ -199,7 +197,6 @@
             "huntii"
             "novus"
             "morio"
-            "polaris"
           ]
       );