From 84dfefcb45ec98fd7c397ba354391e2be7e7e195 Mon Sep 17 00:00:00 2001 From: Avery Date: Sat, 21 Jun 2025 20:02:48 +0200 Subject: [PATCH] Reorganize common configuration --- common/home-manager/default.nix | 11 ++++ .../home-manager/development.nix | 16 +----- .../home-manager}/nixvim/completion.nix | 0 .../home-manager}/nixvim/default.nix | 0 .../home-manager}/nixvim/lsp.nix | 0 .../home-manager}/nixvim/lualine.nix | 0 .../home-manager}/nixvim/neo-tree.nix | 0 .../home-manager}/nixvim/none-ls.nix | 0 .../home-manager}/nixvim/telescope.nix | 0 .../home-manager}/nixvim/treesitter.nix | 0 .../home-manager}/nixvim/trouble.nix | 0 common/home-manager/zsh.nix | 45 ++++++++++++++++ common/home.nix | 14 ----- common/zsh.nix | 40 --------------- flake.nix | 13 ++--- hosts/mizuki/development.nix | 51 +------------------ hosts/totsugeki/home-manager/default.nix | 4 +- hosts/totsugeki/home-manager/development.nix | 15 ++++++ 18 files changed, 81 insertions(+), 128 deletions(-) create mode 100644 common/home-manager/default.nix rename hosts/totsugeki/home-manager/development/default.nix => common/home-manager/development.nix (85%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/completion.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/default.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/lsp.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/lualine.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/neo-tree.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/none-ls.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/telescope.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/treesitter.nix (100%) rename {hosts/totsugeki/home-manager/development => common/home-manager}/nixvim/trouble.nix (100%) create mode 100644 common/home-manager/zsh.nix delete mode 100644 common/home.nix delete mode 100644 common/zsh.nix create mode 100644 hosts/totsugeki/home-manager/development.nix diff --git a/common/home-manager/default.nix b/common/home-manager/default.nix new file mode 100644 index 0000000..d1fa255 --- /dev/null +++ b/common/home-manager/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + imports = [ ./development.nix ./zsh.nix ]; + home = { + username = "avery"; + homeDirectory = "/home/avery"; + stateVersion = "24.05"; + packages = with pkgs; [ rclone xdg-utils ]; + sessionVariables = { EDITOR = "nvim"; }; + }; + programs.home-manager.enable = true; +} diff --git a/hosts/totsugeki/home-manager/development/default.nix b/common/home-manager/development.nix similarity index 85% rename from hosts/totsugeki/home-manager/development/default.nix rename to common/home-manager/development.nix index ce85b81..e671249 100644 --- a/hosts/totsugeki/home-manager/development/default.nix +++ b/common/home-manager/development.nix @@ -1,18 +1,6 @@ { pkgs, ... }: { imports = [ ./nixvim ]; - home = { - packages = with pkgs; [ - android-studio - android-tools - git-credential-manager - gnupg - pass - dotnet-sdk_8 - unityhub - mitmproxy - xh - ]; - }; + home = { packages = with pkgs; [ git-credential-manager gnupg pass ]; }; programs = { git = { enable = true; @@ -24,7 +12,7 @@ "https://git.rcia.dev".provider = "generic"; }; init.defaultBranch = "main"; - merge.tool = "nvim -d"; + merge.tool = "nvimdiff"; }; signing = { key = "B684FD451B692E04"; diff --git a/hosts/totsugeki/home-manager/development/nixvim/completion.nix b/common/home-manager/nixvim/completion.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/completion.nix rename to common/home-manager/nixvim/completion.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/default.nix b/common/home-manager/nixvim/default.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/default.nix rename to common/home-manager/nixvim/default.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/lsp.nix b/common/home-manager/nixvim/lsp.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/lsp.nix rename to common/home-manager/nixvim/lsp.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/lualine.nix b/common/home-manager/nixvim/lualine.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/lualine.nix rename to common/home-manager/nixvim/lualine.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/neo-tree.nix b/common/home-manager/nixvim/neo-tree.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/neo-tree.nix rename to common/home-manager/nixvim/neo-tree.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/none-ls.nix b/common/home-manager/nixvim/none-ls.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/none-ls.nix rename to common/home-manager/nixvim/none-ls.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/telescope.nix b/common/home-manager/nixvim/telescope.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/telescope.nix rename to common/home-manager/nixvim/telescope.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/treesitter.nix b/common/home-manager/nixvim/treesitter.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/treesitter.nix rename to common/home-manager/nixvim/treesitter.nix diff --git a/hosts/totsugeki/home-manager/development/nixvim/trouble.nix b/common/home-manager/nixvim/trouble.nix similarity index 100% rename from hosts/totsugeki/home-manager/development/nixvim/trouble.nix rename to common/home-manager/nixvim/trouble.nix diff --git a/common/home-manager/zsh.nix b/common/home-manager/zsh.nix new file mode 100644 index 0000000..2da6aa6 --- /dev/null +++ b/common/home-manager/zsh.nix @@ -0,0 +1,45 @@ +{ config, lib, ... }: { + programs = { + zsh = { + enable = true; + initContent = let + earlyInit = lib.mkBefore '' + setopt AUTO_PUSHD + setopt SHARE_HISTORY + setopt MENUCOMPLETE + autoload -U history-search-end + zle -N history-beginning-search-backward-end history-search-end + zle -N history-beginning-search-forward-end history-search-end + bindkey "^[OA" history-beginning-search-backward-end + bindkey "^[OB" history-beginning-search-forward-end + bindkey "^r" history-incremental-search-backward + + zstyle ':completion::complete:*' use-cache on + zstyle ':completion::complete:*' cache-path ~/.zsh/cache/$HOST + zstyle ':completion:*' menu select=1 _complete _ignored _approximate + zstyle ':completion:*' verbose yes + zstyle ':completion:*:descriptions' format '%B%d%b' + zstyle ':completion:*:messages' format '%d' + zstyle ':completion:*:warnings' format 'No matches for: %d' + zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' + zstyle ':completion:*' group-name \'\' + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' + ''; + postInit = lib.mkAfter '' + if [ -x "$(command -v fastfetch)" ]; then + fastfetch + fi + ''; + in lib.mkMerge [ earlyInit postInit ]; + history.path = "${config.xdg.dataHome}/zhistory"; + syntaxHighlighting.enable = true; + }; + starship = { + enable = true; + settings = { + add_newline = true; + + }; + }; + }; +} diff --git a/common/home.nix b/common/home.nix deleted file mode 100644 index c45439f..0000000 --- a/common/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: { - home = { - username = "avery"; - homeDirectory = "/home/avery"; - stateVersion = "24.05"; - packages = with pkgs; [ python3 rclone xdg-utils ]; - sessionVariables = { - EDITOR = "nvim"; - DOTNET_ROOT = "${pkgs.dotnet-sdk_8}"; - }; - sessionPath = [ "$HOME/.dotnet/tools" ]; - }; - programs.home-manager.enable = true; -} diff --git a/common/zsh.nix b/common/zsh.nix deleted file mode 100644 index b93a554..0000000 --- a/common/zsh.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, lib, ... }: { - programs = { - zsh = { - enable = true; - initContent = lib.mkBefore '' - setopt AUTO_PUSHD - setopt SHARE_HISTORY - setopt MENUCOMPLETE - autoload -U history-search-end - zle -N history-beginning-search-backward-end history-search-end - zle -N history-beginning-search-forward-end history-search-end - bindkey "^[OA" history-beginning-search-backward-end - bindkey "^[OB" history-beginning-search-forward-end - bindkey "^r" history-incremental-search-backward - - zstyle ':completion::complete:*' use-cache on - zstyle ':completion::complete:*' cache-path ~/.zsh/cache/$HOST - zstyle ':completion:*' menu select=1 _complete _ignored _approximate - zstyle ':completion:*' verbose yes - zstyle ':completion:*:descriptions' format '%B%d%b' - zstyle ':completion:*:messages' format '%d' - zstyle ':completion:*:warnings' format 'No matches for: %d' - zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' - zstyle ':completion:*' group-name \'\' - zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' - - fastfetch - ''; - history.path = "${config.xdg.dataHome}/zhistory"; - syntaxHighlighting.enable = true; - }; - starship = { - enable = true; - settings = { - add_newline = true; - - }; - }; - }; -} diff --git a/flake.nix b/flake.nix index ac6ba13..d40f61a 100644 --- a/flake.nix +++ b/flake.nix @@ -61,8 +61,7 @@ inputs.ags.homeManagerModules.default inputs.autofirma-nix.homeManagerModules.default inputs.nixvim.homeManagerModules.nixvim - ./common/home.nix - ./common/zsh.nix + ./common/home-manager ./hosts/totsugeki/home-manager ]; }; @@ -86,9 +85,7 @@ users.avery = { imports = [ inputs.nixvim.homeManagerModules.nixvim - ./common/home.nix - ./common/zsh.nix - ./hosts/totsugeki/home-manager/development/nixvim + ./common/home-manager ]; }; }; @@ -99,8 +96,8 @@ mizuki = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - inputs.nixos-wsl.nixosModules.default ./hosts/mizuki/nixos.nix + inputs.nixos-wsl.nixosModules.default inputs.home-manager.nixosModules.home-manager { home-manager = { @@ -110,9 +107,7 @@ imports = [ inputs.nixvim.homeManagerModules.nixvim ./hosts/mizuki/home.nix - ./common/zsh.nix - ./hosts/totsugeki/home-manager/development/nixvim - ./hosts/mizuki/development.nix + ./common/home-manager ]; }; }; diff --git a/hosts/mizuki/development.nix b/hosts/mizuki/development.nix index cc91bc4..64e72f9 100644 --- a/hosts/mizuki/development.nix +++ b/hosts/mizuki/development.nix @@ -1,50 +1 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ xh gnupg git-credential-manager pass wslu ]; - programs = { - git = { - enable = true; - extraConfig = { - init.defaultBranch = "main"; - merge.tool = "nvim -d"; - credential = { - credentialStore = "gpg"; - helper = "${pkgs.git-credential-manager}/bin/git-credential-manager"; - "https://git.rcia.dev".provider = "generic"; - }; - }; - signing = { - key = "B684FD451B692E04"; - signByDefault = true; - }; - userEmail = "aveeryy@protonmail.com"; - userName = "Avery"; - }; - lazygit = { - enable = true; - settings = { - gui.theme = { - activeBorderColor = [ "#89b4fa" "bold" ]; - inactiveBorderColor = [ "#a6adc8" ]; - optionsTextColor = [ "#89b4fa" ]; - selectedLineBgColor = [ "#313244" ]; - selectedRangeBgColor = [ "#313244" ]; - cherryPickedCommitBgColor = [ "#45475a" ]; - cherryPickedCommitFgColor = [ "#89b4fa" ]; - unstagedChangesColor = [ "#f38ba8" ]; - defaultFgColor = [ "#cdd6f4" ]; - searchingActiveBorderColor = [ "#f9e2af" ]; - }; - }; - }; - }; - services = { - gpg-agent = { - defaultCacheTtl = 3600; - enable = true; - enableSshSupport = true; - enableZshIntegration = true; - pinentryPackage = pkgs.pinentry-qt; - }; - }; - -} +{ pkgs, ... }: { home.packages = with pkgs; [ python3 xh wslu ]; } diff --git a/hosts/totsugeki/home-manager/default.nix b/hosts/totsugeki/home-manager/default.nix index fc10e17..511d46d 100644 --- a/hosts/totsugeki/home-manager/default.nix +++ b/hosts/totsugeki/home-manager/default.nix @@ -1 +1,3 @@ -{ ... }: { imports = [ ./desktop ./development ./scripts ./autofirma.nix ]; } +{ ... }: { + imports = [ ./desktop ./development.nix ./scripts ./autofirma.nix ]; +} diff --git a/hosts/totsugeki/home-manager/development.nix b/hosts/totsugeki/home-manager/development.nix new file mode 100644 index 0000000..b85a6f9 --- /dev/null +++ b/hosts/totsugeki/home-manager/development.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: { + home = { + packages = with pkgs; [ + android-studio + android-tools + dotnet-sdk_8 + mitmproxy + python3 + unityhub + xh + ]; + sessionVariables = { DOTNET_ROOT = "${pkgs.dotnet-sdk_8}"; }; + sessionPath = [ "$HOME/.dotnet/tools" ]; + }; +}