a little restructuring of home manager to focus on host specific configs

hosts/nixos/default.nix

@@ -34,6 +34,13 @@
   # allow proprietary packages
   nixpkgs.config.allowUnfree = true;
 
+  # fix power buttons
+  services.logind.settings.Login = {
+    HandlePowerKey = "suspend";
+    HandleLidSwitch = "suspend";
+    #HibernateDelaySec = "30min";
+  };
+
   # power management
   services.autoaspm.enable = true;
   powerManagement.powertop.enable = true;

hosts/nixos/yveltal/configuration.nix

@@ -22,6 +22,7 @@
     tailscale.enable = true;
   };
 
+
   # boot (systemd is going on me)
   boot.loader.systemd-boot.enable = true;   # systemd your pretty cool ya know
   boot.loader.efi.canTouchEfiVariables = true;

users/blake/dots/default.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./librewolf
+    ./kitty
+
+    ./waybar
+
+    ./hypr
+    ./neovim
+    ./lf
+    ./zsh
+    ./ssh
+    ./gpg
+    ./git
+    ./xdg
+  ];
+}

users/blake/dots/hypr/default.nix

@@ -359,6 +359,7 @@
   };
 
   home.pointerCursor = {
+    dotIcons.enable = false;
     enable = true;
     gtk.enable = true;
     x11.enable = true;

users/blake/dots/kitty/default.nix

@@ -3,10 +3,19 @@
   lib,
   config,
   ...
-}: {
+}: let
-  programs.kitty = {
+  program = "kitty";
+  cfg = config.dots.${program};
+  #sec = sops.secrets;
+in {
+  options.dots.${program} = {
+    enable = lib.mkEnableOption "enables ${program}";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.${program} = {
       enable = true;
-#    enableZshIntegration = true;
+      #    enableZshIntegration = true;
       enableGitIntegration = true;
       #darwinLaunchOptions = [""];
       settings = {
@@ -29,5 +38,5 @@
       #      size = 12;
       #    };
     };
-
+  };
 }

users/blake/dots/lf/default.nix

@@ -1,10 +1,22 @@
 {
   pkgs,
+  lib,
   config,
   ...
-}: {
+}: 
+let
+  program = "lf";
+  cfg = config.dots.${program};
+  #sec = sops.secrets;
+in {
+
+  options.dots.${program} = {
+    enable = lib.mkEnableOption "enables ${program}";
+  };
+
+  config = lib.mkIf cfg.enable {
   # just using the normal lfrc
-  programs.lf = {
+    programs.${program} = {
       enable = false;
     };
 
@@ -18,4 +30,5 @@
     xdg.configFile."ctpv/config" = {
       source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/ctpv_config";
     };
+  };
 }

users/blake/dots/librewolf/default.nix

@@ -1,10 +1,23 @@
 {
   pkgs,
+  lib,
   config,
   ...
-}: {
+}: 
+let
+  program = "librewolf";
+  cfg = config.dots.${program};
+  #sec = sops.secrets;
+in {
+
+  options.dots.${program} = {
+    enable = lib.mkEnableOption "enables ${program}";
+  };
+
+  config = lib.mkIf cfg.enable {
     # just using the normal lfrc
-  programs.librewolf = {
+    programs.${program} = {
       enable = true;
     };
+  };
 }

users/blake/dots/ssh/default.nix

@@ -5,6 +5,7 @@
 }: {
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks = {
       "git.blakedheld.xyz" = {
         user = "gitea";

users/blake/home.nix

@@ -21,7 +21,7 @@ in
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
-    #./os/${platform}.nix
+    ./dots
     ./dots/neovim
     ./dots/lf
     ./dots/zsh

users/blake/hosts/yveltal.nix

@@ -8,12 +8,17 @@
   
 {
   imports = [
-    ../dots/hypr
+    ../dots
-    ../dots/kitty
-    ../dots/waybar
-    ../dots/librewolf
   ];
 
+  dots = {
+    lf.enable = true;
+    kitty.enable = true;
+    librewolf.enable = true;
+  };
+
+
+
   home.packages = with pkgs; [
     htop
     sl

users/blake/os/darwin.nix

@@ -1,11 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-  
-{
-
-}

users/blake/os/nixos.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-  
-{
-  imports = [
-  ];
-
-  home.packages = with pkgs; [
-    htop
-    sl
-  ];
-}