From 84b7477cff7640dbe7a1ce654336c457935c5388 Mon Sep 17 00:00:00 2001 From: blake Date: Sat, 1 Nov 2025 12:33:27 -0500 Subject: [PATCH] a little restructuring of home manager to focus on host specific configs --- hosts/nixos/default.nix | 7 +++ hosts/nixos/yveltal/configuration.nix | 1 + users/blake/dots/default.nix | 22 ++++++++++ users/blake/dots/hypr/default.nix | 1 + users/blake/dots/kitty/default.nix | 59 +++++++++++++++----------- users/blake/dots/lf/default.nix | 37 ++++++++++------ users/blake/dots/librewolf/default.nix | 21 +++++++-- users/blake/dots/ssh/default.nix | 1 + users/blake/home.nix | 2 +- users/blake/hosts/yveltal.nix | 13 ++++-- users/blake/os/darwin.nix | 11 ----- users/blake/os/nixos.nix | 17 -------- 12 files changed, 118 insertions(+), 74 deletions(-) create mode 100644 users/blake/dots/default.nix delete mode 100644 users/blake/os/darwin.nix delete mode 100644 users/blake/os/nixos.nix diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix index ea75931..b59ef11 100644 --- a/hosts/nixos/default.nix +++ b/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; diff --git a/hosts/nixos/yveltal/configuration.nix b/hosts/nixos/yveltal/configuration.nix index 285a472..aa6f410 100644 --- a/hosts/nixos/yveltal/configuration.nix +++ b/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; diff --git a/users/blake/dots/default.nix b/users/blake/dots/default.nix new file mode 100644 index 0000000..ec85681 --- /dev/null +++ b/users/blake/dots/default.nix @@ -0,0 +1,22 @@ +{ + pkgs, + lib, + config, + ... +}: { + imports = [ + ./librewolf + ./kitty + + ./waybar + + ./hypr + ./neovim + ./lf + ./zsh + ./ssh + ./gpg + ./git + ./xdg + ]; +} diff --git a/users/blake/dots/hypr/default.nix b/users/blake/dots/hypr/default.nix index 381718e..d0a0f64 100644 --- a/users/blake/dots/hypr/default.nix +++ b/users/blake/dots/hypr/default.nix @@ -359,6 +359,7 @@ }; home.pointerCursor = { + dotIcons.enable = false; enable = true; gtk.enable = true; x11.enable = true; diff --git a/users/blake/dots/kitty/default.nix b/users/blake/dots/kitty/default.nix index cdf0cbe..01d500f 100644 --- a/users/blake/dots/kitty/default.nix +++ b/users/blake/dots/kitty/default.nix @@ -3,31 +3,40 @@ lib, config, ... -}: { - programs.kitty = { - enable = true; -# enableZshIntegration = true; - enableGitIntegration = true; - #darwinLaunchOptions = [""]; - settings = { - dynamic_background_opacity = "no"; - confirm_os_window_close = "0"; - shell_integration = "enabled"; - cursor = "#d0d0d0"; - cursor_shape = "beam"; - cursor_beam_thickness = 2.5; - foreground = "#dddddd"; - background = "#2F1730"; - background_opacity = 0.9; - selection_foreground = "none"; - selection_background = "none"; - term = "xterm-256color"; - }; - # font = { - # package = ; - # name = ; - # size = 12; - # }; +}: let + 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; + enableGitIntegration = true; + #darwinLaunchOptions = [""]; + settings = { + dynamic_background_opacity = "no"; + confirm_os_window_close = "0"; + shell_integration = "enabled"; + cursor = "#d0d0d0"; + cursor_shape = "beam"; + cursor_beam_thickness = 2.5; + foreground = "#dddddd"; + background = "#2F1730"; + background_opacity = 0.9; + selection_foreground = "none"; + selection_background = "none"; + term = "xterm-256color"; + }; + # font = { + # package = ; + # name = ; + # size = 12; + # }; + }; + }; } diff --git a/users/blake/dots/lf/default.nix b/users/blake/dots/lf/default.nix index 893fdc9..0de999d 100644 --- a/users/blake/dots/lf/default.nix +++ b/users/blake/dots/lf/default.nix @@ -1,21 +1,34 @@ { 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 = { - enable = false; - }; + programs.${program} = { + enable = false; + }; - # install it to userspace - home.packages = with pkgs; [lf ctpv trashy]; + # install it to userspace + home.packages = with pkgs; [lf ctpv trashy]; - # link configs - xdg.configFile."lf/lfrc" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/lfrc"; - }; - xdg.configFile."ctpv/config" = { - source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/ctpv_config"; + # link configs + xdg.configFile."lf/lfrc" = { + source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/lfrc"; + }; + xdg.configFile."ctpv/config" = { + source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/ctpv_config"; + }; }; } diff --git a/users/blake/dots/librewolf/default.nix b/users/blake/dots/librewolf/default.nix index 66bda24..e8a384b 100644 --- a/users/blake/dots/librewolf/default.nix +++ b/users/blake/dots/librewolf/default.nix @@ -1,10 +1,23 @@ { pkgs, + lib, config, ... -}: { - # just using the normal lfrc - programs.librewolf = { - enable = true; +}: +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.${program} = { + enable = true; + }; }; } diff --git a/users/blake/dots/ssh/default.nix b/users/blake/dots/ssh/default.nix index 49d8b87..8087a2c 100644 --- a/users/blake/dots/ssh/default.nix +++ b/users/blake/dots/ssh/default.nix @@ -5,6 +5,7 @@ }: { programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "git.blakedheld.xyz" = { user = "gitea"; diff --git a/users/blake/home.nix b/users/blake/home.nix index ca472b3..db1f6ff 100644 --- a/users/blake/home.nix +++ b/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 diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix index 67d88e3..9b6da32 100644 --- a/users/blake/hosts/yveltal.nix +++ b/users/blake/hosts/yveltal.nix @@ -8,12 +8,17 @@ { imports = [ - ../dots/hypr - ../dots/kitty - ../dots/waybar - ../dots/librewolf + ../dots ]; + dots = { + lf.enable = true; + kitty.enable = true; + librewolf.enable = true; + }; + + + home.packages = with pkgs; [ htop sl diff --git a/users/blake/os/darwin.nix b/users/blake/os/darwin.nix deleted file mode 100644 index 7de1d6c..0000000 --- a/users/blake/os/darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: - -{ - -} diff --git a/users/blake/os/nixos.nix b/users/blake/os/nixos.nix deleted file mode 100644 index 6997d11..0000000 --- a/users/blake/os/nixos.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: - -{ - imports = [ - ]; - - home.packages = with pkgs; [ - htop - sl - ]; -}