From d1c2adface918be0c61a3fe56862c691b6a45798 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Sun, 16 Mar 2025 13:58:50 +0000 Subject: [PATCH] git: move from module to user config --- hosts/atlas/default.nix | 1 - hosts/eos/default.nix | 1 - hosts/helios/default.nix | 1 - hosts/hypnos/default.nix | 1 - hosts/odyssey/default.nix | 1 - modules/home-manager/default.nix | 1 - modules/home-manager/programs/git/default.nix | 45 ------------------- modules/home-manager/programs/git/ignore | 24 ---------- users/jordan/default.nix | 1 + users/jordan/git.nix | 42 +++++++++++++++++ 10 files changed, 43 insertions(+), 75 deletions(-) delete mode 100644 modules/home-manager/programs/git/default.nix delete mode 100644 modules/home-manager/programs/git/ignore create mode 100644 users/jordan/git.nix diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix index 03d688b..0e8b8c4 100644 --- a/hosts/atlas/default.nix +++ b/hosts/atlas/default.nix @@ -24,7 +24,6 @@ modules = { programs = { firefox.enable = true; - git.enable = true; gpg.enable = true; graphics = { raster.enable = true; diff --git a/hosts/eos/default.nix b/hosts/eos/default.nix index c870818..22a7e94 100644 --- a/hosts/eos/default.nix +++ b/hosts/eos/default.nix @@ -27,7 +27,6 @@ modules = { programs = { firefox.enable = true; - git.enable = true; gpg.enable = true; neovim.enable = true; pass.enable = true; diff --git a/hosts/helios/default.nix b/hosts/helios/default.nix index 364ccc5..eadd192 100644 --- a/hosts/helios/default.nix +++ b/hosts/helios/default.nix @@ -28,7 +28,6 @@ modules = { programs = { firefox.enable = true; - git.enable = true; gpg.enable = true; neovim.enable = true; pass.enable = true; diff --git a/hosts/hypnos/default.nix b/hosts/hypnos/default.nix index 066f307..682416b 100644 --- a/hosts/hypnos/default.nix +++ b/hosts/hypnos/default.nix @@ -51,7 +51,6 @@ modules = { programs = { firefox.enable = true; - git.enable = true; gpg.enable = true; neovim.enable = true; pass.enable = true; diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix index e7d477b..a7fd079 100644 --- a/hosts/odyssey/default.nix +++ b/hosts/odyssey/default.nix @@ -63,7 +63,6 @@ xbox.enable = true; }; firefox.enable = true; - git.enable = true; gpg.enable = true; graphics = { modeling.enable = true; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 513c4f6..4874bfd 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -5,7 +5,6 @@ ./programs/emulators.nix ./programs/firefox.nix ./programs/forensics.nix - ./programs/git ./programs/gpg.nix ./programs/graphics.nix ./programs/libreoffice.nix diff --git a/modules/home-manager/programs/git/default.nix b/modules/home-manager/programs/git/default.nix deleted file mode 100644 index bb3a0ed..0000000 --- a/modules/home-manager/programs/git/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - config, - lib, - ... -}: - -let - cfg = config.modules.programs.git; -in -{ - options.modules.programs.git = { - enable = lib.mkOption { - default = false; - example = true; - }; - }; - - config = lib.mkIf cfg.enable { - home.programs.git = { - enable = true; - aliases = { - amend = "commit --amend"; - lg = "log --color --graph --abbrev-commit --"; - ls = "ls-files"; - unadd = "reset HEAD"; - undo-commit = "reset --soft \"HEAD^\""; - }; - userEmail = "jordan@vimium.com"; - userName = "Jordan Holt"; - signing = { - key = "B8CFFF61F1CCF520"; - signByDefault = true; - }; - extraConfig = { - rebase.autosquash = true; - push.default = "current"; - pull.rebase = true; - }; - }; - - home.configFile = { - "git/ignore".source = ./ignore; - }; - }; -} diff --git a/modules/home-manager/programs/git/ignore b/modules/home-manager/programs/git/ignore deleted file mode 100644 index d9f2575..0000000 --- a/modules/home-manager/programs/git/ignore +++ /dev/null @@ -1,24 +0,0 @@ -# CMake -cmake-build-*/ - -# Linux trash folder -.Trash-* - -# Swap -[._]*.s[a-v][a-z] -[._]*.sw[a-p] -[._]s[a-rt-v][a-z] -[._]ss[a-gi-z] -[._]sw[a-p] - -# Session -Session.vim -Sessionx.vim - -# Temporary -.netrwhist -*~ -# Auto-generated tag files -tags -# Persistent undo -[._]*.un~ diff --git a/users/jordan/default.nix b/users/jordan/default.nix index 38fb121..15f4900 100644 --- a/users/jordan/default.nix +++ b/users/jordan/default.nix @@ -31,6 +31,7 @@ in home-manager.users.${name} = { imports = [ + ./git.nix ./shell.nix ]; diff --git a/users/jordan/git.nix b/users/jordan/git.nix new file mode 100644 index 0000000..7030afb --- /dev/null +++ b/users/jordan/git.nix @@ -0,0 +1,42 @@ +{ + ... +}: + +{ + home.programs.git = { + enable = true; + aliases = { + amend = "commit --amend"; + lg = "log --color --graph --abbrev-commit --"; + ls = "ls-files"; + unadd = "reset HEAD"; + undo-commit = "reset --soft \"HEAD^\""; + }; + ignores = [ + ".Trash-*" + "[._]*.s[a-v][a-z]" + "[._]*.sw[a-p]" + "[._]s[a-rt-v][a-z]" + "[._]ss[a-gi-z]" + "[._]sw[a-p]" + "Session.vim" + "Sessionx.vim" + ".netrwhist" + "*~" + "tags" + "[._]*.un~" + "cmake-build-*/" + ]; + userEmail = "jordan@vimium.com"; + userName = "Jordan Holt"; + signing = { + key = "B8CFFF61F1CCF520"; + signByDefault = true; + }; + extraConfig = { + rebase.autosquash = true; + push.default = "current"; + pull.rebase = true; + }; + }; +}