diff --git a/devshells/haskell.nix b/devshells/haskell.nix index 0091fc0..b347ecc 100644 --- a/devshells/haskell.nix +++ b/devshells/haskell.nix @@ -5,6 +5,7 @@ pkgs.mkShell { ghc hpack stack + fourmolu # Formatter cabal-install haskell-language-server haskellPackages.implicit-hie # Automatically generate hie.yaml! diff --git a/dotfiles/neovim/.neoconf.json b/home/features/neovim/config/.neoconf.json similarity index 100% rename from dotfiles/neovim/.neoconf.json rename to home/features/neovim/config/.neoconf.json diff --git a/dotfiles/neovim/README.md b/home/features/neovim/config/README.md similarity index 100% rename from dotfiles/neovim/README.md rename to home/features/neovim/config/README.md diff --git a/dotfiles/neovim/ftplugin/hkf.lua b/home/features/neovim/config/ftplugin/hkf.lua similarity index 100% rename from dotfiles/neovim/ftplugin/hkf.lua rename to home/features/neovim/config/ftplugin/hkf.lua diff --git a/dotfiles/neovim/ftplugin/lua.lua b/home/features/neovim/config/ftplugin/lua.lua similarity index 100% rename from dotfiles/neovim/ftplugin/lua.lua rename to home/features/neovim/config/ftplugin/lua.lua diff --git a/dotfiles/neovim/ftplugin/markdown.lua b/home/features/neovim/config/ftplugin/markdown.lua similarity index 100% rename from dotfiles/neovim/ftplugin/markdown.lua rename to home/features/neovim/config/ftplugin/markdown.lua diff --git a/dotfiles/neovim/ftplugin/nix.lua b/home/features/neovim/config/ftplugin/nix.lua similarity index 100% rename from dotfiles/neovim/ftplugin/nix.lua rename to home/features/neovim/config/ftplugin/nix.lua diff --git a/dotfiles/neovim/ftplugin/purescript.lua b/home/features/neovim/config/ftplugin/purescript.lua similarity index 100% rename from dotfiles/neovim/ftplugin/purescript.lua rename to home/features/neovim/config/ftplugin/purescript.lua diff --git a/dotfiles/neovim/ftplugin/tex.lua b/home/features/neovim/config/ftplugin/tex.lua similarity index 100% rename from dotfiles/neovim/ftplugin/tex.lua rename to home/features/neovim/config/ftplugin/tex.lua diff --git a/dotfiles/neovim/ftplugin/typst.lua b/home/features/neovim/config/ftplugin/typst.lua similarity index 100% rename from dotfiles/neovim/ftplugin/typst.lua rename to home/features/neovim/config/ftplugin/typst.lua diff --git a/dotfiles/neovim/init.lua b/home/features/neovim/config/init.lua similarity index 100% rename from dotfiles/neovim/init.lua rename to home/features/neovim/config/init.lua diff --git a/dotfiles/neovim/lazy-lock.json b/home/features/neovim/config/lazy-lock.json similarity index 100% rename from dotfiles/neovim/lazy-lock.json rename to home/features/neovim/config/lazy-lock.json diff --git a/dotfiles/neovim/lua/my/abbreviations/fp.lua b/home/features/neovim/config/lua/my/abbreviations/fp.lua similarity index 100% rename from dotfiles/neovim/lua/my/abbreviations/fp.lua rename to home/features/neovim/config/lua/my/abbreviations/fp.lua diff --git a/dotfiles/neovim/lua/my/abbreviations/global.lua b/home/features/neovim/config/lua/my/abbreviations/global.lua similarity index 100% rename from dotfiles/neovim/lua/my/abbreviations/global.lua rename to home/features/neovim/config/lua/my/abbreviations/global.lua diff --git a/dotfiles/neovim/lua/my/abbreviations/init.lua b/home/features/neovim/config/lua/my/abbreviations/init.lua similarity index 100% rename from dotfiles/neovim/lua/my/abbreviations/init.lua rename to home/features/neovim/config/lua/my/abbreviations/init.lua diff --git a/dotfiles/neovim/lua/my/abbreviations/math.lua b/home/features/neovim/config/lua/my/abbreviations/math.lua similarity index 100% rename from dotfiles/neovim/lua/my/abbreviations/math.lua rename to home/features/neovim/config/lua/my/abbreviations/math.lua diff --git a/dotfiles/neovim/lua/my/abbreviations/unicode.lua b/home/features/neovim/config/lua/my/abbreviations/unicode.lua similarity index 100% rename from dotfiles/neovim/lua/my/abbreviations/unicode.lua rename to home/features/neovim/config/lua/my/abbreviations/unicode.lua diff --git a/dotfiles/neovim/lua/my/helpers.lua b/home/features/neovim/config/lua/my/helpers.lua similarity index 100% rename from dotfiles/neovim/lua/my/helpers.lua rename to home/features/neovim/config/lua/my/helpers.lua diff --git a/dotfiles/neovim/lua/my/helpers/env.lua b/home/features/neovim/config/lua/my/helpers/env.lua similarity index 100% rename from dotfiles/neovim/lua/my/helpers/env.lua rename to home/features/neovim/config/lua/my/helpers/env.lua diff --git a/dotfiles/neovim/lua/my/helpers/math/mod.lua b/home/features/neovim/config/lua/my/helpers/math/mod.lua similarity index 100% rename from dotfiles/neovim/lua/my/helpers/math/mod.lua rename to home/features/neovim/config/lua/my/helpers/math/mod.lua diff --git a/dotfiles/neovim/lua/my/helpers/string.lua b/home/features/neovim/config/lua/my/helpers/string.lua similarity index 100% rename from dotfiles/neovim/lua/my/helpers/string.lua rename to home/features/neovim/config/lua/my/helpers/string.lua diff --git a/dotfiles/neovim/lua/my/helpers/wrapMovement.lua b/home/features/neovim/config/lua/my/helpers/wrapMovement.lua similarity index 100% rename from dotfiles/neovim/lua/my/helpers/wrapMovement.lua rename to home/features/neovim/config/lua/my/helpers/wrapMovement.lua diff --git a/dotfiles/neovim/lua/my/init.lua b/home/features/neovim/config/lua/my/init.lua similarity index 100% rename from dotfiles/neovim/lua/my/init.lua rename to home/features/neovim/config/lua/my/init.lua diff --git a/dotfiles/neovim/lua/my/keymaps.lua b/home/features/neovim/config/lua/my/keymaps.lua similarity index 100% rename from dotfiles/neovim/lua/my/keymaps.lua rename to home/features/neovim/config/lua/my/keymaps.lua diff --git a/dotfiles/neovim/lua/my/lazy.lua b/home/features/neovim/config/lua/my/lazy.lua similarity index 100% rename from dotfiles/neovim/lua/my/lazy.lua rename to home/features/neovim/config/lua/my/lazy.lua diff --git a/dotfiles/neovim/lua/my/neovide.lua b/home/features/neovim/config/lua/my/neovide.lua similarity index 100% rename from dotfiles/neovim/lua/my/neovide.lua rename to home/features/neovim/config/lua/my/neovide.lua diff --git a/dotfiles/neovim/lua/my/options.lua b/home/features/neovim/config/lua/my/options.lua similarity index 100% rename from dotfiles/neovim/lua/my/options.lua rename to home/features/neovim/config/lua/my/options.lua diff --git a/dotfiles/neovim/lua/my/plugins/clipboard-image.lua b/home/features/neovim/config/lua/my/plugins/clipboard-image.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/clipboard-image.lua rename to home/features/neovim/config/lua/my/plugins/clipboard-image.lua diff --git a/dotfiles/neovim/lua/my/plugins/cmp.lua b/home/features/neovim/config/lua/my/plugins/cmp.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/cmp.lua rename to home/features/neovim/config/lua/my/plugins/cmp.lua diff --git a/dotfiles/neovim/lua/my/plugins/crates.lua b/home/features/neovim/config/lua/my/plugins/crates.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/crates.lua rename to home/features/neovim/config/lua/my/plugins/crates.lua diff --git a/dotfiles/neovim/lua/my/plugins/dashboard.lua b/home/features/neovim/config/lua/my/plugins/dashboard.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/dashboard.lua rename to home/features/neovim/config/lua/my/plugins/dashboard.lua diff --git a/dotfiles/neovim/lua/my/plugins/firenvim.lua b/home/features/neovim/config/lua/my/plugins/firenvim.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/firenvim.lua rename to home/features/neovim/config/lua/my/plugins/firenvim.lua diff --git a/dotfiles/neovim/lua/my/plugins/flash.lua b/home/features/neovim/config/lua/my/plugins/flash.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/flash.lua rename to home/features/neovim/config/lua/my/plugins/flash.lua diff --git a/dotfiles/neovim/lua/my/plugins/format-nvim.lua b/home/features/neovim/config/lua/my/plugins/format-nvim.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/format-nvim.lua rename to home/features/neovim/config/lua/my/plugins/format-nvim.lua diff --git a/dotfiles/neovim/lua/my/plugins/gitsigns.lua b/home/features/neovim/config/lua/my/plugins/gitsigns.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/gitsigns.lua rename to home/features/neovim/config/lua/my/plugins/gitsigns.lua diff --git a/dotfiles/neovim/lua/my/plugins/harpoon.lua b/home/features/neovim/config/lua/my/plugins/harpoon.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/harpoon.lua rename to home/features/neovim/config/lua/my/plugins/harpoon.lua diff --git a/dotfiles/neovim/lua/my/plugins/haskell-tools.lua b/home/features/neovim/config/lua/my/plugins/haskell-tools.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/haskell-tools.lua rename to home/features/neovim/config/lua/my/plugins/haskell-tools.lua diff --git a/dotfiles/neovim/lua/my/plugins/hydra.lua b/home/features/neovim/config/lua/my/plugins/hydra.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/hydra.lua rename to home/features/neovim/config/lua/my/plugins/hydra.lua diff --git a/dotfiles/neovim/lua/my/plugins/idris.lua b/home/features/neovim/config/lua/my/plugins/idris.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/idris.lua rename to home/features/neovim/config/lua/my/plugins/idris.lua diff --git a/dotfiles/neovim/lua/my/plugins/init.lua b/home/features/neovim/config/lua/my/plugins/init.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/init.lua rename to home/features/neovim/config/lua/my/plugins/init.lua diff --git a/dotfiles/neovim/lua/my/plugins/iron.lua b/home/features/neovim/config/lua/my/plugins/iron.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/iron.lua rename to home/features/neovim/config/lua/my/plugins/iron.lua diff --git a/dotfiles/neovim/lua/my/plugins/lean.lua b/home/features/neovim/config/lua/my/plugins/lean.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/lean.lua rename to home/features/neovim/config/lua/my/plugins/lean.lua diff --git a/dotfiles/neovim/lua/my/plugins/lspconfig.lua b/home/features/neovim/config/lua/my/plugins/lspconfig.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/lspconfig.lua rename to home/features/neovim/config/lua/my/plugins/lspconfig.lua diff --git a/dotfiles/neovim/lua/my/plugins/lualine.lua b/home/features/neovim/config/lua/my/plugins/lualine.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/lualine.lua rename to home/features/neovim/config/lua/my/plugins/lualine.lua diff --git a/dotfiles/neovim/lua/my/plugins/luasnip.lua b/home/features/neovim/config/lua/my/plugins/luasnip.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/luasnip.lua rename to home/features/neovim/config/lua/my/plugins/luasnip.lua diff --git a/dotfiles/neovim/lua/my/plugins/magma.lua b/home/features/neovim/config/lua/my/plugins/magma.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/magma.lua rename to home/features/neovim/config/lua/my/plugins/magma.lua diff --git a/dotfiles/neovim/lua/my/plugins/mini-files.lua b/home/features/neovim/config/lua/my/plugins/mini-files.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/mini-files.lua rename to home/features/neovim/config/lua/my/plugins/mini-files.lua diff --git a/dotfiles/neovim/lua/my/plugins/mini-operators.lua b/home/features/neovim/config/lua/my/plugins/mini-operators.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/mini-operators.lua rename to home/features/neovim/config/lua/my/plugins/mini-operators.lua diff --git a/dotfiles/neovim/lua/my/plugins/mini-surround.lua b/home/features/neovim/config/lua/my/plugins/mini-surround.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/mini-surround.lua rename to home/features/neovim/config/lua/my/plugins/mini-surround.lua diff --git a/dotfiles/neovim/lua/my/plugins/neoconf.lua b/home/features/neovim/config/lua/my/plugins/neoconf.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/neoconf.lua rename to home/features/neovim/config/lua/my/plugins/neoconf.lua diff --git a/dotfiles/neovim/lua/my/plugins/neogit.lua b/home/features/neovim/config/lua/my/plugins/neogit.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/neogit.lua rename to home/features/neovim/config/lua/my/plugins/neogit.lua diff --git a/dotfiles/neovim/lua/my/plugins/neorg.lua b/home/features/neovim/config/lua/my/plugins/neorg.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/neorg.lua rename to home/features/neovim/config/lua/my/plugins/neorg.lua diff --git a/dotfiles/neovim/lua/my/plugins/null-ls.lua b/home/features/neovim/config/lua/my/plugins/null-ls.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/null-ls.lua rename to home/features/neovim/config/lua/my/plugins/null-ls.lua diff --git a/dotfiles/neovim/lua/my/plugins/nvim-tree.lua b/home/features/neovim/config/lua/my/plugins/nvim-tree.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/nvim-tree.lua rename to home/features/neovim/config/lua/my/plugins/nvim-tree.lua diff --git a/dotfiles/neovim/lua/my/plugins/obsidian.lua b/home/features/neovim/config/lua/my/plugins/obsidian.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/obsidian.lua rename to home/features/neovim/config/lua/my/plugins/obsidian.lua diff --git a/dotfiles/neovim/lua/my/plugins/rust-tools.lua b/home/features/neovim/config/lua/my/plugins/rust-tools.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/rust-tools.lua rename to home/features/neovim/config/lua/my/plugins/rust-tools.lua diff --git a/dotfiles/neovim/lua/my/plugins/telescope.lua b/home/features/neovim/config/lua/my/plugins/telescope.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/telescope.lua rename to home/features/neovim/config/lua/my/plugins/telescope.lua diff --git a/dotfiles/neovim/lua/my/plugins/themes/bluloco.lua b/home/features/neovim/config/lua/my/plugins/themes/bluloco.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/themes/bluloco.lua rename to home/features/neovim/config/lua/my/plugins/themes/bluloco.lua diff --git a/dotfiles/neovim/lua/my/plugins/themes/catppuccin.lua b/home/features/neovim/config/lua/my/plugins/themes/catppuccin.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/themes/catppuccin.lua rename to home/features/neovim/config/lua/my/plugins/themes/catppuccin.lua diff --git a/dotfiles/neovim/lua/my/plugins/themes/helpers.lua b/home/features/neovim/config/lua/my/plugins/themes/helpers.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/themes/helpers.lua rename to home/features/neovim/config/lua/my/plugins/themes/helpers.lua diff --git a/dotfiles/neovim/lua/my/plugins/themes/init.lua b/home/features/neovim/config/lua/my/plugins/themes/init.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/themes/init.lua rename to home/features/neovim/config/lua/my/plugins/themes/init.lua diff --git a/dotfiles/neovim/lua/my/plugins/themes/rosepine.lua b/home/features/neovim/config/lua/my/plugins/themes/rosepine.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/themes/rosepine.lua rename to home/features/neovim/config/lua/my/plugins/themes/rosepine.lua diff --git a/dotfiles/neovim/lua/my/plugins/treesitter.lua b/home/features/neovim/config/lua/my/plugins/treesitter.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/treesitter.lua rename to home/features/neovim/config/lua/my/plugins/treesitter.lua diff --git a/dotfiles/neovim/lua/my/plugins/venn.lua b/home/features/neovim/config/lua/my/plugins/venn.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/venn.lua rename to home/features/neovim/config/lua/my/plugins/venn.lua diff --git a/dotfiles/neovim/lua/my/plugins/vimtex.lua b/home/features/neovim/config/lua/my/plugins/vimtex.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/vimtex.lua rename to home/features/neovim/config/lua/my/plugins/vimtex.lua diff --git a/dotfiles/neovim/lua/my/plugins/vimux.lua b/home/features/neovim/config/lua/my/plugins/vimux.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/vimux.lua rename to home/features/neovim/config/lua/my/plugins/vimux.lua diff --git a/dotfiles/neovim/lua/my/plugins/whichkey.lua b/home/features/neovim/config/lua/my/plugins/whichkey.lua similarity index 100% rename from dotfiles/neovim/lua/my/plugins/whichkey.lua rename to home/features/neovim/config/lua/my/plugins/whichkey.lua diff --git a/dotfiles/neovim/neoconf.json b/home/features/neovim/config/neoconf.json similarity index 100% rename from dotfiles/neovim/neoconf.json rename to home/features/neovim/config/neoconf.json diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index d476a9c..31bd2e2 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -78,7 +78,7 @@ let # {{{ extraRuntime extraRuntime = env: [ # Snippets - (config.satellite.dev.path "dotfiles/vscode-snippets") + (config.satellite.dev.path "home/features/neovim/snippets") # Base16 theme (pkgs.writeTextDir @@ -136,13 +136,10 @@ let in { # {{{ Basic config - # Do not manage neovim via the default home manager module - programs.neovim.enable = false; - # We still want other modules to know that we are using neovim! satellite.toggles.neovim.enable = true; - xdg.configFile.nvim.source = config.satellite.dev.path "dotfiles/neovim"; + xdg.configFile.nvim.source = config.satellite.dev.path "home/features/neovim/config"; home.sessionVariables.EDITOR = "nvim"; home.packages = [ diff --git a/dotfiles/vscode-snippets/README.md b/home/features/neovim/snippets/README.md similarity index 100% rename from dotfiles/vscode-snippets/README.md rename to home/features/neovim/snippets/README.md diff --git a/dotfiles/vscode-snippets/package.json b/home/features/neovim/snippets/package.json similarity index 100% rename from dotfiles/vscode-snippets/package.json rename to home/features/neovim/snippets/package.json diff --git a/dotfiles/vscode-snippets/snippets/latex/core.json b/home/features/neovim/snippets/snippets/latex/core.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/latex/core.json rename to home/features/neovim/snippets/snippets/latex/core.json diff --git a/dotfiles/vscode-snippets/snippets/latex/explain.json b/home/features/neovim/snippets/snippets/latex/explain.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/latex/explain.json rename to home/features/neovim/snippets/snippets/latex/explain.json diff --git a/dotfiles/vscode-snippets/snippets/lua/core.json b/home/features/neovim/snippets/snippets/lua/core.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/lua/core.json rename to home/features/neovim/snippets/snippets/lua/core.json diff --git a/dotfiles/vscode-snippets/snippets/nix/core.json b/home/features/neovim/snippets/snippets/nix/core.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/nix/core.json rename to home/features/neovim/snippets/snippets/nix/core.json diff --git a/dotfiles/vscode-snippets/snippets/purescript/deriving.json b/home/features/neovim/snippets/snippets/purescript/deriving.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/purescript/deriving.json rename to home/features/neovim/snippets/snippets/purescript/deriving.json diff --git a/dotfiles/vscode-snippets/snippets/purescript/imports.json b/home/features/neovim/snippets/snippets/purescript/imports.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/purescript/imports.json rename to home/features/neovim/snippets/snippets/purescript/imports.json diff --git a/dotfiles/vscode-snippets/snippets/purescript/other.json b/home/features/neovim/snippets/snippets/purescript/other.json similarity index 100% rename from dotfiles/vscode-snippets/snippets/purescript/other.json rename to home/features/neovim/snippets/snippets/purescript/other.json