From fdff561ad46ec5a60fe35d138c3809270091b8de Mon Sep 17 00:00:00 2001 From: Ethan Reece Date: Sat, 26 Oct 2024 23:25:59 -0500 Subject: [PATCH] Clean up dotfiles --- .gnupg/gpg-agent.conf | 5 ----- {.emacs.d => dotfiles/emacs/.emacs.d}/init.el | 0 gitconfig => dotfiles/git/.gitconfig | 0 {.gnupg => dotfiles/gpg/.gnupg}/common.conf | 0 .../hyprland/.config}/hypr/animations.conf | 0 .../hyprland/.config}/hypr/autostart.conf | 0 .../hyprland/.config}/hypr/bin/attach.sh | 0 .../hyprland/.config}/hypr/bin/lock.sh | 0 .../hyprland/.config}/hypr/colors.conf | 0 .../hyprland/.config}/hypr/hyprland.conf | 0 .../hyprland/.config}/hypr/hyprpaper.conf | 0 .../hyprland/.config}/hypr/input.conf | 0 .../hyprland/.config}/hypr/keybindings.conf | 0 .../hyprland/.config}/hypr/layerrules.conf | 0 .../hyprland/.config}/hypr/monitors.conf | 0 .../hyprland/.config}/hypr/windowrules.conf | 0 .../rbw/.config}/rbw/config.json | 0 .../weechat/.config}/weechat/weechat.conf | 0 .../zathura/.config}/zathura/zathurarc | 0 {.config/fish => fish}/config.fish | 0 home-configuration.scm | 16 ++++++---------- 21 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 .gnupg/gpg-agent.conf rename {.emacs.d => dotfiles/emacs/.emacs.d}/init.el (100%) rename gitconfig => dotfiles/git/.gitconfig (100%) rename {.gnupg => dotfiles/gpg/.gnupg}/common.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/animations.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/autostart.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/bin/attach.sh (100%) rename {.config => dotfiles/hyprland/.config}/hypr/bin/lock.sh (100%) rename {.config => dotfiles/hyprland/.config}/hypr/colors.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/hyprland.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/hyprpaper.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/input.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/keybindings.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/layerrules.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/monitors.conf (100%) rename {.config => dotfiles/hyprland/.config}/hypr/windowrules.conf (100%) rename {.config => dotfiles/rbw/.config}/rbw/config.json (100%) rename {.config => dotfiles/weechat/.config}/weechat/weechat.conf (100%) rename {.config => dotfiles/zathura/.config}/zathura/zathurarc (100%) rename {.config/fish => fish}/config.fish (100%) diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf deleted file mode 100644 index 1a4e3d0..0000000 --- a/.gnupg/gpg-agent.conf +++ /dev/null @@ -1,5 +0,0 @@ -pinentry-program /gnu/store/mglbqwkdyzxqw0gfngmghr7vrkcxwkxa-pinentry-tty-1.2.1/bin/pinentry -default-cache-ttl 600 -max-cache-ttl 7200 -default-cache-ttl-ssh 1800 -max-cache-ttl-ssh 7200 diff --git a/.emacs.d/init.el b/dotfiles/emacs/.emacs.d/init.el similarity index 100% rename from .emacs.d/init.el rename to dotfiles/emacs/.emacs.d/init.el diff --git a/gitconfig b/dotfiles/git/.gitconfig similarity index 100% rename from gitconfig rename to dotfiles/git/.gitconfig diff --git a/.gnupg/common.conf b/dotfiles/gpg/.gnupg/common.conf similarity index 100% rename from .gnupg/common.conf rename to dotfiles/gpg/.gnupg/common.conf diff --git a/.config/hypr/animations.conf b/dotfiles/hyprland/.config/hypr/animations.conf similarity index 100% rename from .config/hypr/animations.conf rename to dotfiles/hyprland/.config/hypr/animations.conf diff --git a/.config/hypr/autostart.conf b/dotfiles/hyprland/.config/hypr/autostart.conf similarity index 100% rename from .config/hypr/autostart.conf rename to dotfiles/hyprland/.config/hypr/autostart.conf diff --git a/.config/hypr/bin/attach.sh b/dotfiles/hyprland/.config/hypr/bin/attach.sh similarity index 100% rename from .config/hypr/bin/attach.sh rename to dotfiles/hyprland/.config/hypr/bin/attach.sh diff --git a/.config/hypr/bin/lock.sh b/dotfiles/hyprland/.config/hypr/bin/lock.sh similarity index 100% rename from .config/hypr/bin/lock.sh rename to dotfiles/hyprland/.config/hypr/bin/lock.sh diff --git a/.config/hypr/colors.conf b/dotfiles/hyprland/.config/hypr/colors.conf similarity index 100% rename from .config/hypr/colors.conf rename to dotfiles/hyprland/.config/hypr/colors.conf diff --git a/.config/hypr/hyprland.conf b/dotfiles/hyprland/.config/hypr/hyprland.conf similarity index 100% rename from .config/hypr/hyprland.conf rename to dotfiles/hyprland/.config/hypr/hyprland.conf diff --git a/.config/hypr/hyprpaper.conf b/dotfiles/hyprland/.config/hypr/hyprpaper.conf similarity index 100% rename from .config/hypr/hyprpaper.conf rename to dotfiles/hyprland/.config/hypr/hyprpaper.conf diff --git a/.config/hypr/input.conf b/dotfiles/hyprland/.config/hypr/input.conf similarity index 100% rename from .config/hypr/input.conf rename to dotfiles/hyprland/.config/hypr/input.conf diff --git a/.config/hypr/keybindings.conf b/dotfiles/hyprland/.config/hypr/keybindings.conf similarity index 100% rename from .config/hypr/keybindings.conf rename to dotfiles/hyprland/.config/hypr/keybindings.conf diff --git a/.config/hypr/layerrules.conf b/dotfiles/hyprland/.config/hypr/layerrules.conf similarity index 100% rename from .config/hypr/layerrules.conf rename to dotfiles/hyprland/.config/hypr/layerrules.conf diff --git a/.config/hypr/monitors.conf b/dotfiles/hyprland/.config/hypr/monitors.conf similarity index 100% rename from .config/hypr/monitors.conf rename to dotfiles/hyprland/.config/hypr/monitors.conf diff --git a/.config/hypr/windowrules.conf b/dotfiles/hyprland/.config/hypr/windowrules.conf similarity index 100% rename from .config/hypr/windowrules.conf rename to dotfiles/hyprland/.config/hypr/windowrules.conf diff --git a/.config/rbw/config.json b/dotfiles/rbw/.config/rbw/config.json similarity index 100% rename from .config/rbw/config.json rename to dotfiles/rbw/.config/rbw/config.json diff --git a/.config/weechat/weechat.conf b/dotfiles/weechat/.config/weechat/weechat.conf similarity index 100% rename from .config/weechat/weechat.conf rename to dotfiles/weechat/.config/weechat/weechat.conf diff --git a/.config/zathura/zathurarc b/dotfiles/zathura/.config/zathura/zathurarc similarity index 100% rename from .config/zathura/zathurarc rename to dotfiles/zathura/.config/zathura/zathurarc diff --git a/.config/fish/config.fish b/fish/config.fish similarity index 100% rename from .config/fish/config.fish rename to fish/config.fish diff --git a/home-configuration.scm b/home-configuration.scm index f89f45e..953bb22 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -5,6 +5,7 @@ (guix gexp) (guix channels) (gnu home services) + (gnu home services dotfiles) (gnu home services shells) (gnu home services symlink-manager) (gnu home services guix) @@ -156,16 +157,11 @@ (home-fish-configuration (config (list - (local-file ".config/fish/config.fish"))))) - (service home-files-service-type - `((".emacs.d/init.el" ,(local-file "./.emacs.d/init.el")) - (".gitconfig" ,(local-file "./gitconfig")) - (".gnupg/common.conf" ,(local-file "./.gnupg/common.conf")))) - (service home-xdg-configuration-files-service-type - `(("weechat/weechat.conf" ,(local-file "./.config/weechat/weechat.conf")) - ("zathura/zathurarc" ,(local-file "./.config/zathura/zathurarc")) - ("rbw/config.json" ,(local-file "./.config/rbw/config.json")) - ("guix/channels.scm" ,(local-file "./channels.scm.lock")))) + (local-file "fish/config.fish"))))) + (service home-dotfiles-service-type + (home-dotfiles-configuration + (directories '("./dotfiles")) + (layout 'stow))) (service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program