From 0fc3f1f50110b0f5c82bbb01b0f5b7e729d2cb4f Mon Sep 17 00:00:00 2001 From: blake Date: Mon, 3 Nov 2025 21:12:34 -0600 Subject: [PATCH] big home manager dotfile restructure --- modules/system/syncthing/default.nix | 3 ++- users/blake/dots/browser/default.nix | 11 ++++++++ .../dots/{ => browser}/firefox/default.nix | 0 .../dots/{ => browser}/librewolf/default.nix | 0 users/blake/dots/default.nix | 10 ++------ users/blake/dots/desktop/default.nix | 15 +++++++++++ .../dots/{ => desktop}/dunst/default.nix | 0 users/blake/dots/{ => desktop}/dunst/dunstrc | 0 .../blake/dots/{ => desktop}/hypr/default.nix | 0 .../dots/{ => desktop}/kitty/default.nix | 0 .../dots/{ => desktop}/stylix/default.nix | 0 .../blake/dots/{ => desktop}/tofi/default.nix | 0 .../dots/{ => desktop}/waybar/default.nix | 2 -- users/blake/dots/programs/.default.nix | 25 +++++++++++++++++++ users/blake/dots/programs/default.nix | 12 +++++++++ users/blake/dots/programs/gnucash/default.nix | 20 +++++++++++++++ .../dots/programs/libreoffice/default.nix | 20 +++++++++++++++ users/blake/hosts/yveltal.nix | 2 ++ 18 files changed, 109 insertions(+), 11 deletions(-) create mode 100644 users/blake/dots/browser/default.nix rename users/blake/dots/{ => browser}/firefox/default.nix (100%) rename users/blake/dots/{ => browser}/librewolf/default.nix (100%) create mode 100644 users/blake/dots/desktop/default.nix rename users/blake/dots/{ => desktop}/dunst/default.nix (100%) rename users/blake/dots/{ => desktop}/dunst/dunstrc (100%) rename users/blake/dots/{ => desktop}/hypr/default.nix (100%) rename users/blake/dots/{ => desktop}/kitty/default.nix (100%) rename users/blake/dots/{ => desktop}/stylix/default.nix (100%) rename users/blake/dots/{ => desktop}/tofi/default.nix (100%) rename users/blake/dots/{ => desktop}/waybar/default.nix (99%) create mode 100644 users/blake/dots/programs/.default.nix create mode 100644 users/blake/dots/programs/default.nix create mode 100644 users/blake/dots/programs/gnucash/default.nix create mode 100644 users/blake/dots/programs/libreoffice/default.nix diff --git a/modules/system/syncthing/default.nix b/modules/system/syncthing/default.nix index ac45839..39a26ad 100644 --- a/modules/system/syncthing/default.nix +++ b/modules/system/syncthing/default.nix @@ -40,7 +40,7 @@ in { folders = { "holocron" = { path = "/home/blake/holocron"; - devices = ["lugia" "zygarde" "CEN-IT-07"]; + devices = ["lugia" "zygarde" "CEN-IT-07" "snowbelle"]; id = "5voxg-c3he2"; versioning = { type = "staggered"; @@ -50,6 +50,7 @@ in { maxAge = "0"; }; }; + ignorePerms = true; ignorePatterns = [ "// syncthing" "/.versions" diff --git a/users/blake/dots/browser/default.nix b/users/blake/dots/browser/default.nix new file mode 100644 index 0000000..41f69c7 --- /dev/null +++ b/users/blake/dots/browser/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + lib, + config, + ... +}: { + imports = [ + ./librewolf + ./firefox + ]; +} diff --git a/users/blake/dots/firefox/default.nix b/users/blake/dots/browser/firefox/default.nix similarity index 100% rename from users/blake/dots/firefox/default.nix rename to users/blake/dots/browser/firefox/default.nix diff --git a/users/blake/dots/librewolf/default.nix b/users/blake/dots/browser/librewolf/default.nix similarity index 100% rename from users/blake/dots/librewolf/default.nix rename to users/blake/dots/browser/librewolf/default.nix diff --git a/users/blake/dots/default.nix b/users/blake/dots/default.nix index 7f81e4c..52a146f 100644 --- a/users/blake/dots/default.nix +++ b/users/blake/dots/default.nix @@ -6,13 +6,7 @@ }: { imports = [ ./core - ./librewolf - ./firefox - ./kitty - ./dunst - ./waybar - ./stylix - ./hypr - ./tofi + ./browser + ./desktop ]; } diff --git a/users/blake/dots/desktop/default.nix b/users/blake/dots/desktop/default.nix new file mode 100644 index 0000000..ee470d2 --- /dev/null +++ b/users/blake/dots/desktop/default.nix @@ -0,0 +1,15 @@ +{ + pkgs, + lib, + config, + ... +}: { + imports = [ + ./kitty + ./dunst + ./waybar + ./stylix + ./hypr + ./tofi + ]; +} diff --git a/users/blake/dots/dunst/default.nix b/users/blake/dots/desktop/dunst/default.nix similarity index 100% rename from users/blake/dots/dunst/default.nix rename to users/blake/dots/desktop/dunst/default.nix diff --git a/users/blake/dots/dunst/dunstrc b/users/blake/dots/desktop/dunst/dunstrc similarity index 100% rename from users/blake/dots/dunst/dunstrc rename to users/blake/dots/desktop/dunst/dunstrc diff --git a/users/blake/dots/hypr/default.nix b/users/blake/dots/desktop/hypr/default.nix similarity index 100% rename from users/blake/dots/hypr/default.nix rename to users/blake/dots/desktop/hypr/default.nix diff --git a/users/blake/dots/kitty/default.nix b/users/blake/dots/desktop/kitty/default.nix similarity index 100% rename from users/blake/dots/kitty/default.nix rename to users/blake/dots/desktop/kitty/default.nix diff --git a/users/blake/dots/stylix/default.nix b/users/blake/dots/desktop/stylix/default.nix similarity index 100% rename from users/blake/dots/stylix/default.nix rename to users/blake/dots/desktop/stylix/default.nix diff --git a/users/blake/dots/tofi/default.nix b/users/blake/dots/desktop/tofi/default.nix similarity index 100% rename from users/blake/dots/tofi/default.nix rename to users/blake/dots/desktop/tofi/default.nix diff --git a/users/blake/dots/waybar/default.nix b/users/blake/dots/desktop/waybar/default.nix similarity index 99% rename from users/blake/dots/waybar/default.nix rename to users/blake/dots/desktop/waybar/default.nix index 09c1b28..2ce2d0c 100644 --- a/users/blake/dots/waybar/default.nix +++ b/users/blake/dots/desktop/waybar/default.nix @@ -290,8 +290,6 @@ in { brightnessctl bluetuith bluez - nerd-fonts.ubuntu - nerd-fonts.ubuntu-mono ]; }; } diff --git a/users/blake/dots/programs/.default.nix b/users/blake/dots/programs/.default.nix new file mode 100644 index 0000000..82b89a3 --- /dev/null +++ b/users/blake/dots/programs/.default.nix @@ -0,0 +1,25 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = ""; + cfg = config.dots.${program}; +in { + options.dots.${program} = { + enable = lib.mkEnableOption "enables ${program}"; + }; + + config = lib.mkIf cfg.enable { + + # enable with home-manager + programs.${program} = { + enable = true; + }; + + # just install package + home.packages = with pkgs; []; + + }; +} diff --git a/users/blake/dots/programs/default.nix b/users/blake/dots/programs/default.nix new file mode 100644 index 0000000..a08447b --- /dev/null +++ b/users/blake/dots/programs/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + config, + ... +}: { + imports = [ + ./gnucash + ./libreoffice + #./gaming + ]; +} diff --git a/users/blake/dots/programs/gnucash/default.nix b/users/blake/dots/programs/gnucash/default.nix new file mode 100644 index 0000000..cfaa57e --- /dev/null +++ b/users/blake/dots/programs/gnucash/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = "gnucash"; + cfg = config.dots.${program}; +in { + options.dots.${program} = { + enable = lib.mkEnableOption "enables ${program}"; + }; + + config = lib.mkIf cfg.enable { + + # just install package + home.packages = with pkgs; [gnucash]; + + }; +} diff --git a/users/blake/dots/programs/libreoffice/default.nix b/users/blake/dots/programs/libreoffice/default.nix new file mode 100644 index 0000000..caaf82e --- /dev/null +++ b/users/blake/dots/programs/libreoffice/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = "libreoffice"; + cfg = config.dots.${program}; +in { + options.dots.${program} = { + enable = lib.mkEnableOption "enables ${program}"; + }; + + config = lib.mkIf cfg.enable { + + # just install package + home.packages = with pkgs; [libreoffice-qt6]; + + }; +} diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix index c3f3ec5..d3f57d3 100644 --- a/users/blake/hosts/yveltal.nix +++ b/users/blake/hosts/yveltal.nix @@ -28,6 +28,8 @@ git.enable = true; xdg.enable = true; + libreoffice.enable = true; + gnucash.enable = true; };