refactor: move nested home to top level

2024-06-12 18:15:03 +07:00 · 2024-06-12 18:15:03 +07:00 · fb2238e26f
parent 6cf3070f8c
commit fb2238e26f
100 changed files with 5 additions and 5 deletions
--- a/flake.nix
+++ b/flake.nix
@ -87,7 +87,7 @@
                    ./system
                    {
                      home-manager.extraSpecialArgs = specialArgs;
-                      home-manager.users.tigor = import ./home/tigor;
+                      home-manager.users.tigor = import ./home;
                    }
                  ] ++ commonModules;
                specialArgs = specialArgs;
@ -104,7 +104,7 @@
                ./system
                {
                  home-manager.extraSpecialArgs = specialArgs;
-                  home-manager.users.tigor = import ./home/tigor;
+                  home-manager.users.tigor = import ./home;
                }
              ] ++ commonModules;
              specialArgs = specialArgs;
@ -121,7 +121,7 @@
                ./system
                {
                  home-manager.extraSpecialArgs = specialArgs;
-                  home-manager.users.tigor = import ./home/tigor;
+                  home-manager.users.tigor = import ./home;
                }
              ] ++ commonModules;
              specialArgs = specialArgs;
--- a/home/tigor/config/ideavim/.ideavimrc
+++ b/home/tigor/config/ideavim/.ideavimrc
--- a/home/tigor/config/ideavim/default.nix
+++ b/home/tigor/config/ideavim/default.nix
--- a/home/tigor/config/kitty/default.nix
+++ b/home/tigor/config/kitty/default.nix
--- a/home/tigor/config/kitty/kitty.conf
+++ b/home/tigor/config/kitty/kitty.conf
--- a/home/tigor/config/kitty/kitty.d/00-base.conf
+++ b/home/tigor/config/kitty/kitty.d/00-base.conf
--- a/home/tigor/config/kitty/kitty.d/01-fonts.conf
+++ b/home/tigor/config/kitty/kitty.d/01-fonts.conf
--- a/home/tigor/config/kitty/kitty.d/10-layout.conf
+++ b/home/tigor/config/kitty/kitty.d/10-layout.conf
--- a/home/tigor/config/kitty/kitty.d/20-window.conf
+++ b/home/tigor/config/kitty/kitty.d/20-window.conf
--- a/home/tigor/config/kitty/kitty.d/30-transparency.conf
+++ b/home/tigor/config/kitty/kitty.d/30-transparency.conf
--- a/home/tigor/config/nvim/.gitignore
+++ b/home/tigor/config/nvim/.gitignore
--- a/home/tigor/config/nvim/.neoconf.json
+++ b/home/tigor/config/nvim/.neoconf.json
--- a/home/tigor/config/nvim/LICENSE
+++ b/home/tigor/config/nvim/LICENSE
--- a/home/tigor/config/nvim/README.md
+++ b/home/tigor/config/nvim/README.md
--- a/home/tigor/config/nvim/default.nix
+++ b/home/tigor/config/nvim/default.nix
--- a/home/tigor/config/nvim/init.lua
+++ b/home/tigor/config/nvim/init.lua
--- a/home/tigor/config/nvim/lua/config/autocmds.lua
+++ b/home/tigor/config/nvim/lua/config/autocmds.lua
--- a/home/tigor/config/nvim/lua/config/keymaps.lua
+++ b/home/tigor/config/nvim/lua/config/keymaps.lua
--- a/home/tigor/config/nvim/lua/config/lazy.lua
+++ b/home/tigor/config/nvim/lua/config/lazy.lua
--- a/home/tigor/config/nvim/lua/config/neovide.lua
+++ b/home/tigor/config/nvim/lua/config/neovide.lua
--- a/home/tigor/config/nvim/lua/config/options.lua
+++ b/home/tigor/config/nvim/lua/config/options.lua
--- a/home/tigor/config/nvim/lua/plugins/arrow.lua
+++ b/home/tigor/config/nvim/lua/plugins/arrow.lua
--- a/home/tigor/config/nvim/lua/plugins/base16.lua
+++ b/home/tigor/config/nvim/lua/plugins/base16.lua
--- a/home/tigor/config/nvim/lua/plugins/before.lua
+++ b/home/tigor/config/nvim/lua/plugins/before.lua
--- a/home/tigor/config/nvim/lua/plugins/caddyfile.lua
+++ b/home/tigor/config/nvim/lua/plugins/caddyfile.lua
--- a/home/tigor/config/nvim/lua/plugins/catppuccin.lua
+++ b/home/tigor/config/nvim/lua/plugins/catppuccin.lua
--- a/home/tigor/config/nvim/lua/plugins/cmp.lua
+++ b/home/tigor/config/nvim/lua/plugins/cmp.lua
--- a/home/tigor/config/nvim/lua/plugins/conform.lua
+++ b/home/tigor/config/nvim/lua/plugins/conform.lua
--- a/home/tigor/config/nvim/lua/plugins/copilot.lua
+++ b/home/tigor/config/nvim/lua/plugins/copilot.lua
--- a/home/tigor/config/nvim/lua/plugins/corn.lua
+++ b/home/tigor/config/nvim/lua/plugins/corn.lua
--- a/home/tigor/config/nvim/lua/plugins/diagflow.lua
+++ b/home/tigor/config/nvim/lua/plugins/diagflow.lua
--- a/home/tigor/config/nvim/lua/plugins/discord-presence.lua
+++ b/home/tigor/config/nvim/lua/plugins/discord-presence.lua
--- a/home/tigor/config/nvim/lua/plugins/gitsigns.lua
+++ b/home/tigor/config/nvim/lua/plugins/gitsigns.lua
--- a/home/tigor/config/nvim/lua/plugins/incline.lua
+++ b/home/tigor/config/nvim/lua/plugins/incline.lua
--- a/home/tigor/config/nvim/lua/plugins/java.lua
+++ b/home/tigor/config/nvim/lua/plugins/java.lua
--- a/home/tigor/config/nvim/lua/plugins/lang-go.lua
+++ b/home/tigor/config/nvim/lua/plugins/lang-go.lua
--- a/home/tigor/config/nvim/lua/plugins/lazygit.lua
+++ b/home/tigor/config/nvim/lua/plugins/lazygit.lua
--- a/home/tigor/config/nvim/lua/plugins/lsp-html.lua
+++ b/home/tigor/config/nvim/lua/plugins/lsp-html.lua
--- a/home/tigor/config/nvim/lua/plugins/lsp-lazy.lua
+++ b/home/tigor/config/nvim/lua/plugins/lsp-lazy.lua
--- a/home/tigor/config/nvim/lua/plugins/lspconfig.lua
+++ b/home/tigor/config/nvim/lua/plugins/lspconfig.lua
--- a/home/tigor/config/nvim/lua/plugins/luasnip.lua
+++ b/home/tigor/config/nvim/lua/plugins/luasnip.lua
--- a/home/tigor/config/nvim/lua/plugins/makefile.lua
+++ b/home/tigor/config/nvim/lua/plugins/makefile.lua
--- a/home/tigor/config/nvim/lua/plugins/markdown.lua
+++ b/home/tigor/config/nvim/lua/plugins/markdown.lua
--- a/home/tigor/config/nvim/lua/plugins/mason.lua
+++ b/home/tigor/config/nvim/lua/plugins/mason.lua
--- a/home/tigor/config/nvim/lua/plugins/mini_files.lua
+++ b/home/tigor/config/nvim/lua/plugins/mini_files.lua
--- a/home/tigor/config/nvim/lua/plugins/neotree.lua
+++ b/home/tigor/config/nvim/lua/plugins/neotree.lua
--- a/home/tigor/config/nvim/lua/plugins/nix.lua
+++ b/home/tigor/config/nvim/lua/plugins/nix.lua
--- a/home/tigor/config/nvim/lua/plugins/notifier.lua
+++ b/home/tigor/config/nvim/lua/plugins/notifier.lua
--- a/home/tigor/config/nvim/lua/plugins/obsidian.lua
+++ b/home/tigor/config/nvim/lua/plugins/obsidian.lua
--- a/home/tigor/config/nvim/lua/plugins/oil.lua
+++ b/home/tigor/config/nvim/lua/plugins/oil.lua
--- a/home/tigor/config/nvim/lua/plugins/precognition.lua
+++ b/home/tigor/config/nvim/lua/plugins/precognition.lua
--- a/home/tigor/config/nvim/lua/plugins/protobuf.lua
+++ b/home/tigor/config/nvim/lua/plugins/protobuf.lua
--- a/home/tigor/config/nvim/lua/plugins/rest.lua
+++ b/home/tigor/config/nvim/lua/plugins/rest.lua
--- a/home/tigor/config/nvim/lua/plugins/rose-pine.lua
+++ b/home/tigor/config/nvim/lua/plugins/rose-pine.lua
--- a/home/tigor/config/nvim/lua/plugins/silicon.lua
+++ b/home/tigor/config/nvim/lua/plugins/silicon.lua
--- a/home/tigor/config/nvim/lua/plugins/ssh.lua
+++ b/home/tigor/config/nvim/lua/plugins/ssh.lua
--- a/home/tigor/config/nvim/lua/plugins/tailwind.lua
+++ b/home/tigor/config/nvim/lua/plugins/tailwind.lua
--- a/home/tigor/config/nvim/lua/plugins/telescope-fzf-native.lua
+++ b/home/tigor/config/nvim/lua/plugins/telescope-fzf-native.lua
--- a/home/tigor/config/nvim/lua/plugins/toggleterm.lua
+++ b/home/tigor/config/nvim/lua/plugins/toggleterm.lua
--- a/home/tigor/config/nvim/lua/plugins/treesitter.lua
+++ b/home/tigor/config/nvim/lua/plugins/treesitter.lua
--- a/home/tigor/config/nvim/lua/plugins/vim-test.lua
+++ b/home/tigor/config/nvim/lua/plugins/vim-test.lua
--- a/home/tigor/config/nvim/lua/plugins/yanky.lua
+++ b/home/tigor/config/nvim/lua/plugins/yanky.lua
--- a/home/tigor/config/nvim/lua/snippets/go/apm_span.lua
+++ b/home/tigor/config/nvim/lua/snippets/go/apm_span.lua
--- a/home/tigor/config/nvim/lua/snippets/go/efi.lua
+++ b/home/tigor/config/nvim/lua/snippets/go/efi.lua
--- a/home/tigor/config/nvim/lua/snippets/go/err_tower.lua
+++ b/home/tigor/config/nvim/lua/snippets/go/err_tower.lua
--- a/home/tigor/config/nvim/lua/snippets/go/init.lua
+++ b/home/tigor/config/nvim/lua/snippets/go/init.lua
--- a/home/tigor/config/nvim/lua/snippets/init.lua
+++ b/home/tigor/config/nvim/lua/snippets/init.lua
--- a/home/tigor/config/nvim/queries/go/get-function-params.scm
+++ b/home/tigor/config/nvim/queries/go/get-function-params.scm
--- a/home/tigor/config/nvim/queries/go/package-node.scm
+++ b/home/tigor/config/nvim/queries/go/package-node.scm
--- a/home/tigor/config/nvim/queries/go/return-snippet.scm
+++ b/home/tigor/config/nvim/queries/go/return-snippet.scm
--- a/home/tigor/config/nvim/queries/go/search-context.scm
+++ b/home/tigor/config/nvim/queries/go/search-context.scm
--- a/home/tigor/config/nvim/stylua.toml
+++ b/home/tigor/config/nvim/stylua.toml
--- a/home/tigor/config/wezterm/default.nix
+++ b/home/tigor/config/wezterm/default.nix
--- a/home/tigor/config/wezterm/keys.lua
+++ b/home/tigor/config/wezterm/keys.lua
--- a/home/tigor/config/wezterm/stylua.toml
+++ b/home/tigor/config/wezterm/stylua.toml
--- a/home/tigor/config/wezterm/wezterm.lua
+++ b/home/tigor/config/wezterm/wezterm.lua
--- a/home/tigor/default.nix
+++ b/home/tigor/default.nix
@ -8,7 +8,7 @@ in
    profile-path

    ./programs
-    ../modules
+    ./modules

    ./config/wezterm
    ./config/nvim
--- a/home/tigor/direnv.nix
+++ b/home/tigor/direnv.nix
--- a/home/tigor/programs/bitwarden.nix
+++ b/home/tigor/programs/bitwarden.nix
--- a/home/tigor/programs/chromium.nix
+++ b/home/tigor/programs/chromium.nix
--- a/home/tigor/programs/dbeaver.nix
+++ b/home/tigor/programs/dbeaver.nix
--- a/home/tigor/programs/default.nix
+++ b/home/tigor/programs/default.nix
--- a/home/tigor/programs/discord.nix
+++ b/home/tigor/programs/discord.nix
--- a/home/tigor/programs/git.nix
+++ b/home/tigor/programs/git.nix
--- a/home/tigor/programs/github.nix
+++ b/home/tigor/programs/github.nix
--- a/home/tigor/programs/go.nix
+++ b/home/tigor/programs/go.nix
--- a/home/tigor/programs/jellyfin.nix
+++ b/home/tigor/programs/jellyfin.nix
--- a/home/tigor/programs/mpv.nix
+++ b/home/tigor/programs/mpv.nix
--- a/home/tigor/programs/neovide.nix
+++ b/home/tigor/programs/neovide.nix
--- a/home/tigor/programs/nnn.nix
+++ b/home/tigor/programs/nnn.nix
--- a/home/tigor/programs/node.nix
+++ b/home/tigor/programs/node.nix
--- a/home/tigor/programs/slack.nix
+++ b/home/tigor/programs/slack.nix
--- a/home/tigor/programs/spotify.nix
+++ b/home/tigor/programs/spotify.nix
--- a/home/tigor/programs/starship.nix
+++ b/home/tigor/programs/starship.nix
--- a/home/tigor/programs/tofi.nix
+++ b/home/tigor/programs/tofi.nix
--- a/home/tigor/programs/variety.nix
+++ b/home/tigor/programs/variety.nix
--- a/home/tigor/programs/vscode.nix
+++ b/home/tigor/programs/vscode.nix
--- a/home/tigor/programs/whatsapp.nix
+++ b/home/tigor/programs/whatsapp.nix
--- a/home/tigor/programs/zsh.nix
+++ b/home/tigor/programs/zsh.nix
--- a/home/tigor/secrets.nix
+++ b/home/tigor/secrets.nix
@ -1,7 +1,7 @@
 { config, ... }:
 {
  sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFile = ../secrets/secrets.yaml;
    defaultSopsFormat = "yaml";
    age.keyFile = "/home/${config.home.username}/.config/sops/age/keys.txt";