diff --git a/.gitattributes b/.gitattributes index b44acd7..c77fb68 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ flake.lock -diff +home/secrets/* -diff diff --git a/.gitignore b/.gitignore index 12a2448..4680598 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # secrets .gitsecret/keys/random_seed !*.secret -modules/secrets.nix +home/secrets/default.nix # Generated by nix-pre-commit-hooks /.pre-commit-config.yaml diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg index 2cdd46b..8bdbf5b 100644 --- a/.gitsecret/paths/mapping.cfg +++ b/.gitsecret/paths/mapping.cfg @@ -1 +1 @@ -modules/secrets.nix:bc21321a6d7bbbf00f8357ad0c1868361d7c4ad4379647f7e8807facd6093b80 +home/secrets/default.nix:0e6b6e9c57743af34dd280dbafc83d5c27ca599e60c267f9eb63201ab7510856 diff --git a/flake.nix b/flake.nix index 358143d..13b2cdb 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ sops.homeManagerModules.sops hyprland.homeManagerModules.default ]; - users.winston.imports = [./home.nix]; + users.winston.imports = [./home]; extraSpecialArgs = { flakePath = "/home/winston/.config/nixpkgs"; machine.personal = true; @@ -102,7 +102,7 @@ # TODO: remove hyprland from darwin, I just need this to work right now hyprland.homeManagerModules.default ]; - users.winston.imports = [./home.nix]; + users.winston.imports = [./home]; extraSpecialArgs = { flakePath = "/Users/winston/.config/nixpkgs"; machine.personal = true; diff --git a/modules/firefox.nix b/home/apps/firefox.nix similarity index 100% rename from modules/firefox.nix rename to home/apps/firefox.nix diff --git a/modules/git.nix b/home/apps/git.nix similarity index 100% rename from modules/git.nix rename to home/apps/git.nix diff --git a/modules/gpg.nix b/home/apps/gpg.nix similarity index 100% rename from modules/gpg.nix rename to home/apps/gpg.nix diff --git a/modules/i3.nix b/home/apps/i3.nix similarity index 100% rename from modules/i3.nix rename to home/apps/i3.nix diff --git a/modules/k9s/skin.json b/home/apps/k9s/skin.json similarity index 100% rename from modules/k9s/skin.json rename to home/apps/k9s/skin.json diff --git a/modules/karabiner/karabiner.json b/home/apps/karabiner/karabiner.json similarity index 100% rename from modules/karabiner/karabiner.json rename to home/apps/karabiner/karabiner.json diff --git a/modules/kubernetes.nix b/home/apps/kubernetes.nix similarity index 100% rename from modules/kubernetes.nix rename to home/apps/kubernetes.nix diff --git a/modules/lsd/config.yaml b/home/apps/lsd/config.yaml similarity index 100% rename from modules/lsd/config.yaml rename to home/apps/lsd/config.yaml diff --git a/modules/mail.nix b/home/apps/mail.nix similarity index 100% rename from modules/mail.nix rename to home/apps/mail.nix diff --git a/modules/music.nix b/home/apps/music.nix similarity index 100% rename from modules/music.nix rename to home/apps/music.nix diff --git a/modules/neomutt/openurl b/home/apps/neomutt/openurl similarity index 100% rename from modules/neomutt/openurl rename to home/apps/neomutt/openurl diff --git a/modules/neovim.nix b/home/apps/neovim.nix similarity index 94% rename from modules/neovim.nix rename to home/apps/neovim.nix index bd899c6..c72239e 100644 --- a/modules/neovim.nix +++ b/home/apps/neovim.nix @@ -77,7 +77,7 @@ }; xdg.configFile."nvim" = { - source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/neovim"; + source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/neovim"; recursive = true; }; } diff --git a/modules/neovim/after/plugin/auto-dark-mode.lua b/home/apps/neovim/after/plugin/auto-dark-mode.lua similarity index 100% rename from modules/neovim/after/plugin/auto-dark-mode.lua rename to home/apps/neovim/after/plugin/auto-dark-mode.lua diff --git a/modules/neovim/after/plugin/bufferline.lua b/home/apps/neovim/after/plugin/bufferline.lua similarity index 100% rename from modules/neovim/after/plugin/bufferline.lua rename to home/apps/neovim/after/plugin/bufferline.lua diff --git a/modules/neovim/after/plugin/catppuccin.lua b/home/apps/neovim/after/plugin/catppuccin.lua similarity index 100% rename from modules/neovim/after/plugin/catppuccin.lua rename to home/apps/neovim/after/plugin/catppuccin.lua diff --git a/modules/neovim/after/plugin/colorizer.lua b/home/apps/neovim/after/plugin/colorizer.lua similarity index 100% rename from modules/neovim/after/plugin/colorizer.lua rename to home/apps/neovim/after/plugin/colorizer.lua diff --git a/modules/neovim/after/plugin/copilot.lua b/home/apps/neovim/after/plugin/copilot.lua similarity index 100% rename from modules/neovim/after/plugin/copilot.lua rename to home/apps/neovim/after/plugin/copilot.lua diff --git a/modules/neovim/after/plugin/feline.lua b/home/apps/neovim/after/plugin/feline.lua similarity index 100% rename from modules/neovim/after/plugin/feline.lua rename to home/apps/neovim/after/plugin/feline.lua diff --git a/modules/neovim/after/plugin/gitsigns.lua b/home/apps/neovim/after/plugin/gitsigns.lua similarity index 100% rename from modules/neovim/after/plugin/gitsigns.lua rename to home/apps/neovim/after/plugin/gitsigns.lua diff --git a/modules/neovim/after/plugin/indent_blankline.lua b/home/apps/neovim/after/plugin/indent_blankline.lua similarity index 100% rename from modules/neovim/after/plugin/indent_blankline.lua rename to home/apps/neovim/after/plugin/indent_blankline.lua diff --git a/modules/neovim/after/plugin/neogit.lua b/home/apps/neovim/after/plugin/neogit.lua similarity index 100% rename from modules/neovim/after/plugin/neogit.lua rename to home/apps/neovim/after/plugin/neogit.lua diff --git a/modules/neovim/after/plugin/nvim-autopairs.lua b/home/apps/neovim/after/plugin/nvim-autopairs.lua similarity index 100% rename from modules/neovim/after/plugin/nvim-autopairs.lua rename to home/apps/neovim/after/plugin/nvim-autopairs.lua diff --git a/modules/neovim/after/plugin/nvim-tree.lua b/home/apps/neovim/after/plugin/nvim-tree.lua similarity index 100% rename from modules/neovim/after/plugin/nvim-tree.lua rename to home/apps/neovim/after/plugin/nvim-tree.lua diff --git a/modules/neovim/after/plugin/presence.lua b/home/apps/neovim/after/plugin/presence.lua similarity index 100% rename from modules/neovim/after/plugin/presence.lua rename to home/apps/neovim/after/plugin/presence.lua diff --git a/modules/neovim/after/plugin/telescope.lua b/home/apps/neovim/after/plugin/telescope.lua similarity index 100% rename from modules/neovim/after/plugin/telescope.lua rename to home/apps/neovim/after/plugin/telescope.lua diff --git a/modules/neovim/after/plugin/treesitter.lua b/home/apps/neovim/after/plugin/treesitter.lua similarity index 100% rename from modules/neovim/after/plugin/treesitter.lua rename to home/apps/neovim/after/plugin/treesitter.lua diff --git a/modules/neovim/after/plugin/which-key.lua b/home/apps/neovim/after/plugin/which-key.lua similarity index 100% rename from modules/neovim/after/plugin/which-key.lua rename to home/apps/neovim/after/plugin/which-key.lua diff --git a/modules/neovim/init.lua b/home/apps/neovim/init.lua similarity index 100% rename from modules/neovim/init.lua rename to home/apps/neovim/init.lua diff --git a/modules/neovim/lazy-lock.json b/home/apps/neovim/lazy-lock.json similarity index 100% rename from modules/neovim/lazy-lock.json rename to home/apps/neovim/lazy-lock.json diff --git a/modules/neovim/lua/binds.lua b/home/apps/neovim/lua/binds.lua similarity index 100% rename from modules/neovim/lua/binds.lua rename to home/apps/neovim/lua/binds.lua diff --git a/modules/neovim/lua/lsp/go.lua b/home/apps/neovim/lua/lsp/go.lua similarity index 100% rename from modules/neovim/lua/lsp/go.lua rename to home/apps/neovim/lua/lsp/go.lua diff --git a/modules/neovim/lua/lsp/helm-ls.lua b/home/apps/neovim/lua/lsp/helm-ls.lua similarity index 100% rename from modules/neovim/lua/lsp/helm-ls.lua rename to home/apps/neovim/lua/lsp/helm-ls.lua diff --git a/modules/neovim/lua/lsp/init.lua b/home/apps/neovim/lua/lsp/init.lua similarity index 100% rename from modules/neovim/lua/lsp/init.lua rename to home/apps/neovim/lua/lsp/init.lua diff --git a/modules/neovim/lua/lsp/null-ls.lua b/home/apps/neovim/lua/lsp/null-ls.lua similarity index 100% rename from modules/neovim/lua/lsp/null-ls.lua rename to home/apps/neovim/lua/lsp/null-ls.lua diff --git a/modules/neovim/lua/lsp/validation.lua b/home/apps/neovim/lua/lsp/validation.lua similarity index 100% rename from modules/neovim/lua/lsp/validation.lua rename to home/apps/neovim/lua/lsp/validation.lua diff --git a/modules/neovim/lua/lsp/webdev.lua b/home/apps/neovim/lua/lsp/webdev.lua similarity index 100% rename from modules/neovim/lua/lsp/webdev.lua rename to home/apps/neovim/lua/lsp/webdev.lua diff --git a/modules/neovim/lua/lsp/yaml.lua b/home/apps/neovim/lua/lsp/yaml.lua similarity index 100% rename from modules/neovim/lua/lsp/yaml.lua rename to home/apps/neovim/lua/lsp/yaml.lua diff --git a/modules/neovim/lua/plugins.lua b/home/apps/neovim/lua/plugins.lua similarity index 100% rename from modules/neovim/lua/plugins.lua rename to home/apps/neovim/lua/plugins.lua diff --git a/modules/neovim/snippets/yaml.json b/home/apps/neovim/snippets/yaml.json similarity index 100% rename from modules/neovim/snippets/yaml.json rename to home/apps/neovim/snippets/yaml.json diff --git a/modules/newsboat.nix b/home/apps/newsboat.nix similarity index 100% rename from modules/newsboat.nix rename to home/apps/newsboat.nix diff --git a/modules/rice.nix b/home/apps/rice.nix similarity index 100% rename from modules/rice.nix rename to home/apps/rice.nix diff --git a/modules/rofi/theme.rasi b/home/apps/rofi/theme.rasi similarity index 100% rename from modules/rofi/theme.rasi rename to home/apps/rofi/theme.rasi diff --git a/modules/sketchybar.nix b/home/apps/sketchybar.nix similarity index 100% rename from modules/sketchybar.nix rename to home/apps/sketchybar.nix diff --git a/modules/sketchybar/plugins/clock.sh b/home/apps/sketchybar/plugins/clock.sh similarity index 100% rename from modules/sketchybar/plugins/clock.sh rename to home/apps/sketchybar/plugins/clock.sh diff --git a/modules/sketchybar/plugins/colordummy.sh b/home/apps/sketchybar/plugins/colordummy.sh similarity index 100% rename from modules/sketchybar/plugins/colordummy.sh rename to home/apps/sketchybar/plugins/colordummy.sh diff --git a/modules/sketchybar/plugins/music.sh b/home/apps/sketchybar/plugins/music.sh similarity index 100% rename from modules/sketchybar/plugins/music.sh rename to home/apps/sketchybar/plugins/music.sh diff --git a/modules/sketchybar/plugins/space.sh b/home/apps/sketchybar/plugins/space.sh similarity index 100% rename from modules/sketchybar/plugins/space.sh rename to home/apps/sketchybar/plugins/space.sh diff --git a/modules/sketchybar/plugins/window_title.sh b/home/apps/sketchybar/plugins/window_title.sh similarity index 100% rename from modules/sketchybar/plugins/window_title.sh rename to home/apps/sketchybar/plugins/window_title.sh diff --git a/modules/sketchybar/sketchybarrc b/home/apps/sketchybar/sketchybarrc similarity index 100% rename from modules/sketchybar/sketchybarrc rename to home/apps/sketchybar/sketchybarrc diff --git a/modules/skhd/skhdrc b/home/apps/skhd/skhdrc similarity index 100% rename from modules/skhd/skhdrc rename to home/apps/skhd/skhdrc diff --git a/modules/starship/config.toml b/home/apps/starship/config.toml similarity index 100% rename from modules/starship/config.toml rename to home/apps/starship/config.toml diff --git a/modules/vscode.nix b/home/apps/vscode.nix similarity index 91% rename from modules/vscode.nix rename to home/apps/vscode.nix index bf05e81..6d6e2ef 100644 --- a/modules/vscode.nix +++ b/home/apps/vscode.nix @@ -21,11 +21,11 @@ in { home.file = { "${config.xdg.configHome}/Code/User/settings.json" = { enable = isLinux; - source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json"; + source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/vscode/settings.json"; }; "Library/Application Support/Code/User/settings.json" = { enable = isDarwin; - source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json"; + source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/vscode/settings.json"; }; }; } diff --git a/modules/vscode/settings.json b/home/apps/vscode/settings.json similarity index 100% rename from modules/vscode/settings.json rename to home/apps/vscode/settings.json diff --git a/modules/wayland.nix b/home/apps/wayland.nix similarity index 100% rename from modules/wayland.nix rename to home/apps/wayland.nix diff --git a/modules/wezterm.nix b/home/apps/wezterm.nix similarity index 64% rename from modules/wezterm.nix rename to home/apps/wezterm.nix index cb87801..7692a05 100644 --- a/modules/wezterm.nix +++ b/home/apps/wezterm.nix @@ -6,7 +6,7 @@ home.sessionVariables = {TERMINAL = "wezterm";}; xdg.configFile."wezterm" = { - source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/wezterm"; + source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/wezterm"; recursive = true; }; } diff --git a/modules/wezterm/bar.lua b/home/apps/wezterm/bar.lua similarity index 100% rename from modules/wezterm/bar.lua rename to home/apps/wezterm/bar.lua diff --git a/modules/wezterm/fonts.lua b/home/apps/wezterm/fonts.lua similarity index 100% rename from modules/wezterm/fonts.lua rename to home/apps/wezterm/fonts.lua diff --git a/modules/wezterm/shortcuts.lua b/home/apps/wezterm/shortcuts.lua similarity index 100% rename from modules/wezterm/shortcuts.lua rename to home/apps/wezterm/shortcuts.lua diff --git a/modules/wezterm/theme.lua b/home/apps/wezterm/theme.lua similarity index 100% rename from modules/wezterm/theme.lua rename to home/apps/wezterm/theme.lua diff --git a/modules/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua similarity index 100% rename from modules/wezterm/wezterm.lua rename to home/apps/wezterm/wezterm.lua diff --git a/modules/zsh.nix b/home/apps/zsh.nix similarity index 92% rename from modules/zsh.nix rename to home/apps/zsh.nix index c1d00ed..72c3646 100644 --- a/modules/zsh.nix +++ b/home/apps/zsh.nix @@ -104,8 +104,8 @@ in { }; xdg.configFile = { - "lsd" = symlink "modules/lsd" {recursive = true;}; - "starship.toml" = symlink "modules/starship/config.toml" {}; - "zsh/functions" = symlink "modules/zsh/functions" {recursive = true;}; + "lsd" = symlink "home/apps/lsd" {recursive = true;}; + "starship.toml" = symlink "home/apps/starship/config.toml" {}; + "zsh/functions" = symlink "home/apps/zsh/functions" {recursive = true;}; }; } diff --git a/modules/zsh/functions/icat.zsh b/home/apps/zsh/functions/icat.zsh similarity index 100% rename from modules/zsh/functions/icat.zsh rename to home/apps/zsh/functions/icat.zsh diff --git a/home.nix b/home/default.nix similarity index 80% rename from home.nix rename to home/default.nix index edde9be..a91887b 100644 --- a/home.nix +++ b/home/default.nix @@ -9,23 +9,23 @@ in { imports = [ - ./modules/firefox.nix - ./modules/git.nix - ./modules/gpg.nix - ./modules/i3.nix - ./modules/kubernetes.nix - ./modules/mail.nix - ./modules/music.nix - ./modules/neovim.nix - ./modules/newsboat.nix - ./modules/rice.nix - ./modules/sops.nix - ./modules/vscode.nix - ./modules/wayland.nix - ./modules/wezterm.nix - ./modules/zsh.nix + ./apps/firefox.nix + ./apps/git.nix + ./apps/gpg.nix + ./apps/i3.nix + ./apps/kubernetes.nix + ./apps/mail.nix + ./apps/music.nix + ./apps/neovim.nix + ./apps/newsboat.nix + ./apps/rice.nix + ./apps/vscode.nix + ./apps/wayland.nix + ./apps/wezterm.nix + ./apps/zsh.nix + ./secrets/sops.nix ] - ++ lib.optionals (builtins.pathExists ./modules/secrets.nix) [./modules/secrets.nix]; + ++ lib.optionals (builtins.pathExists ./secrets/default.nix) [./secrets]; home = { packages = with pkgs; ([ diff --git a/home/secrets/default.nix.secret b/home/secrets/default.nix.secret new file mode 100644 index 0000000..fd53eeb Binary files /dev/null and b/home/secrets/default.nix.secret differ diff --git a/home/fonts/berkeley_bold.json b/home/secrets/fonts/berkeley_bold.json similarity index 100% rename from home/fonts/berkeley_bold.json rename to home/secrets/fonts/berkeley_bold.json diff --git a/home/fonts/berkeley_bold_italic.json b/home/secrets/fonts/berkeley_bold_italic.json similarity index 100% rename from home/fonts/berkeley_bold_italic.json rename to home/secrets/fonts/berkeley_bold_italic.json diff --git a/home/fonts/berkeley_italic.json b/home/secrets/fonts/berkeley_italic.json similarity index 100% rename from home/fonts/berkeley_italic.json rename to home/secrets/fonts/berkeley_italic.json diff --git a/home/fonts/berkeley_regular.json b/home/secrets/fonts/berkeley_regular.json similarity index 100% rename from home/fonts/berkeley_regular.json rename to home/secrets/fonts/berkeley_regular.json diff --git a/home/fonts/comic_code_bold.json b/home/secrets/fonts/comic_code_bold.json similarity index 100% rename from home/fonts/comic_code_bold.json rename to home/secrets/fonts/comic_code_bold.json diff --git a/home/fonts/comic_code_bold_italic.json b/home/secrets/fonts/comic_code_bold_italic.json similarity index 100% rename from home/fonts/comic_code_bold_italic.json rename to home/secrets/fonts/comic_code_bold_italic.json diff --git a/home/fonts/comic_code_italic.json b/home/secrets/fonts/comic_code_italic.json similarity index 100% rename from home/fonts/comic_code_italic.json rename to home/secrets/fonts/comic_code_italic.json diff --git a/home/fonts/comic_code_medium.json b/home/secrets/fonts/comic_code_medium.json similarity index 100% rename from home/fonts/comic_code_medium.json rename to home/secrets/fonts/comic_code_medium.json diff --git a/home/fonts/comic_code_medium_italic.json b/home/secrets/fonts/comic_code_medium_italic.json similarity index 100% rename from home/fonts/comic_code_medium_italic.json rename to home/secrets/fonts/comic_code_medium_italic.json diff --git a/home/fonts/comic_code_regular.json b/home/secrets/fonts/comic_code_regular.json similarity index 100% rename from home/fonts/comic_code_regular.json rename to home/secrets/fonts/comic_code_regular.json diff --git a/secrets.yaml b/home/secrets/main.yaml similarity index 100% rename from secrets.yaml rename to home/secrets/main.yaml diff --git a/modules/sops.nix b/home/secrets/sops.nix similarity index 93% rename from modules/sops.nix rename to home/secrets/sops.nix index 653bddc..55551d8 100644 --- a/modules/sops.nix +++ b/home/secrets/sops.nix @@ -14,12 +14,12 @@ then "${config.home.homeDirectory}/Library/Fonts/${fontname}.otf" else throw "Unsupported platform"; format = "binary"; - sopsFile = ../home/fonts/${fontname}.json; + sopsFile = ./fonts/${fontname}.json; }; in { sops = { gnupg.home = "${config.xdg.configHome}/gnupg"; - defaultSopsFile = ../secrets.yaml; + defaultSopsFile = ./main.yaml; secrets = { "kubernetes-work-prod".path = "${config.xdg.configHome}/kube/work-prod"; "berkeley_regular" = fontMapping "berkeley_regular"; diff --git a/justfile b/justfile index 6fc4875..07cd534 100644 --- a/justfile +++ b/justfile @@ -11,7 +11,7 @@ boot: secret-stage && secret-unstage sudo nixos-rebuild boot --flake . secret-stage: - git add -f modules/secrets.nix + git add -f home/secrets/default.nix secret-unstage: - git restore --staged modules/secrets.nix + git restore --staged home/secrets/default.nix diff --git a/modules/secrets.nix.secret b/modules/secrets.nix.secret deleted file mode 100644 index c0ae9b3..0000000 Binary files a/modules/secrets.nix.secret and /dev/null differ