wip

elythh · Aug 30, 2024 · bfc25d8 · bfc25d8
1 parent 0ac737f
commit bfc25d8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 95 deletions.
diff --git a/homes/x86_64-linux/gwen@grovetender/default.nix b/homes/x86_64-linux/gwen@grovetender/default.nix
@@ -73,7 +73,7 @@ in
       xdg = enabled;
     };
 
-    theme.enable = true;
+    theme = enabled;
 
     suites = {
       art = enabled;

diff --git a/modules/home/programs/graphical/bars/waybar/default.nix b/modules/home/programs/graphical/bars/waybar/default.nix
@@ -86,7 +86,7 @@ let
       custom-modules
       default-modules
       group-modules
-      (lib.mkIf config.${namespace}.programs.graphical.wms.hyprland.enable hyprland-modules)
+      hyprland-modules
     ];
 
   generateOutputSettings =

diff --git a/modules/home/programs/graphical/screenlockers/hyprlock/default.nix b/modules/home/programs/graphical/screenlockers/hyprlock/default.nix
@@ -145,7 +145,9 @@ let
   '';
 in
 {
-  options.${namespace}.programs.graphical.screenlockers.hyprlock.enable = mkBoolOpt false "Enable Hyprlock";
+  options.${namespace}.programs.graphical.screenlockers.hyprlock = {
+    enable = mkBoolOpt false "Enable Hyprlock";
+  };
 
   config = mkIf cfg.enable {
     programs.hyprlock = with config.lib.stylix.colors; {

diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix
@@ -191,30 +191,5 @@ in
         wlroots = enabled;
       };
     };
-
-    wayland.windowManager.hyprland = {
-      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-      plugins = [
-        #inputs.hyprspace.packages.${pkgs.system}.Hyprspace
-        #inputs.hyprsplit.packages.${pkgs.system}.hyprsplit
-        #inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces
-      ];
-      xwayland.enable = true;
-      enable = true;
-      systemd = {
-        enable = true;
-        extraCommands = lib.mkBefore [
-          "systemctl --user stop graphical-session.target"
-          "systemctl --user start hyprland-session.target"
-        ];
-      };
-    };
-
-    systemd.user.targets.tray = {
-      Unit = {
-        Description = "Home Manager System Tray";
-        Requires = [ "graphical-session-pre.target" ];
-      };
-    };
   };
 }
diff --git a/modules/home/programs/terminal/tools/git/default.nix b/modules/home/programs/terminal/tools/git/default.nix
@@ -11,9 +11,8 @@ let
     mkEnableOption
     mkIf
     mkForce
-    getExe'
     ;
-  inherit (lib.${namespace}) mkOpt mkBoolOpt enabled;
+  inherit (lib.${namespace}) mkOpt mkBoolOpt;
   inherit (config.${namespace}) user;
 
   cfg = config.${namespace}.programs.terminal.tools.git;
@@ -69,57 +68,6 @@ in
           };
         };
 
-        extraConfig = {
-          credential = {
-            helper =
-              if cfg.wslAgentBridge then
-                cfg.wslGitCredentialManagerPath
-              else if pkgs.stdenv.isLinux then
-                ''${getExe' config.programs.git.package "git-credential-libsecret"}''
-              else
-                ''${getExe' config.programs.git.package "git-credential-osxkeychain"}'';
-
-            useHttpPath = true;
-          };
-
-          fetch = {
-            prune = true;
-          };
-
-          gpg.format = "ssh";
-          "gpg \"ssh\"".program = mkIf cfg._1password (
-            ''''
-            + ''${lib.optionalString pkgs.stdenv.isLinux (getExe' pkgs._1password-gui "op-ssh-sign")}''
-            + ''${lib.optionalString pkgs.stdenv.isDarwin "${pkgs._1password-gui}/Applications/1Password.app/Contents/MacOS/op-ssh-sign"}''
-          );
-
-          init = {
-            defaultBranch = "main";
-          };
-
-          lfs = enabled;
-
-          pull = {
-            rebase = true;
-          };
-
-          push = {
-            autoSetupRemote = true;
-            default = "current";
-          };
-
-          rebase = {
-            autoStash = true;
-          };
-
-          safe = {
-            directory = [
-              "~/${namespace}/"
-              "/etc/nixos"
-            ];
-          };
-        };
-
         signing = {
           key = cfg.signingKey;
           inherit (cfg) signByDefault;

diff --git a/modules/home/programs/terminal/tools/ssh/default.nix b/modules/home/programs/terminal/tools/ssh/default.nix
@@ -3,7 +3,6 @@
   lib,
   inputs,
   host,
-  pkgs,
   namespace,
   ...
 }:
@@ -85,10 +84,6 @@ in
       shellAliases = foldl (
         aliases: system: aliases // { "ssh-${system}" = "ssh ${system} -t tmux a"; }
       ) { } (builtins.attrNames other-hosts);
-
-      file = mkIf pkgs.stdenv.isDarwin {
-        ".ssh/authorized_keys".text = builtins.concatStringsSep "\n" cfg.authorizedKeys;
-      };
     };
   };
 }
diff --git a/modules/home/theme/stylix/default.nix b/modules/home/theme/stylix/default.nix
@@ -8,8 +8,8 @@
 let
   inherit (lib)
     mkIf
-    mkEnableOption
     types
+    mkEnableOption
     ;
   inherit (lib.${namespace}) mkOpt;
 

diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix
@@ -16,7 +16,7 @@ let
     getExe
     getExe'
     ;
-  inherit (lib.${namespace}) mkOpt enabled;
+  inherit (lib.${namespace}) mkOpt mkBoolOpt enabled;
   inherit (inputs) snowfall-flake;
 
   cfg = config.${namespace}.user;
@@ -31,7 +31,7 @@ let
 in
 {
   options.${namespace}.user = {
-    enable = mkOpt types.bool false "Whether to configure the user account.";
+    enable = mkBoolOpt false "Whether to configure the user account.";
     email = mkOpt types.str "[email protected]" "The email of the user.";
     fullName = mkOpt types.str "Gwenc'hlan Le Kerneau" "The full name of the user.";
     home = mkOpt (types.nullOr types.str) home-directory "The user's home directory.";

diff --git a/modules/nixos/security/polkit/default.nix b/modules/nixos/security/polkit/default.nix
@@ -23,12 +23,6 @@ in
       enable = true;
       debug = lib.mkDefault true;
 
-      extraConfig = lib.mkIf config.security.polkit.debug ''
-        /* Log authorization checks. */
-        polkit.addRule(function(action, subject) {
-          polkit.log("user " +  subject.user + " is attempting action " + action.id + " from PID " + subject.pid);
-        });
-      '';
     };
 
     systemd = {