diff options
| -rw-r--r-- | home/default.nix | 2 | ||||
| -rw-r--r-- | home/neovim/completion.nix | 1 | ||||
| -rw-r--r-- | home/neovim/default.nix | 3 | ||||
| -rw-r--r-- | home/neovim/editing-plugins.nix | 26 | ||||
| -rw-r--r-- | hosts/muhammed/configuration.nix | 4 | ||||
| -rw-r--r-- | hosts/muhammed/home/default.nix | 10 | ||||
| -rw-r--r-- | hosts/muhammed/home/iterm2/default.nix (renamed from home/iterm2/default.nix) | 0 | ||||
| -rw-r--r-- | hosts/muhammed/home/neovim/conjure.nix (renamed from home/neovim/plugins.nix) | 25 | ||||
| -rw-r--r-- | hosts/muhammed/home/neovim/default.nix | 8 | ||||
| -rw-r--r-- | hosts/muhammed/home/neovim/lsp.nix (renamed from home/neovim/lsp.nix) | 4 | ||||
| -rw-r--r-- | hosts/muhammed/home/noweb/default.nix (renamed from home/noweb/default.nix) | 0 |
11 files changed, 53 insertions, 30 deletions
diff --git a/home/default.nix b/home/default.nix index 93c3720..d02e7b3 100644 --- a/home/default.nix +++ b/home/default.nix @@ -22,8 +22,6 @@ ./git ./dev-utils ./networking-utils - ./iterm2 - ./noweb ] ++ builtins.attrValues flakeOutputs.homeModules; diff --git a/home/neovim/completion.nix b/home/neovim/completion.nix index 904491d..3776674 100644 --- a/home/neovim/completion.nix +++ b/home/neovim/completion.nix @@ -43,6 +43,5 @@ cmp-calc cmp-buffer cmp-path - cmp-conjure ]; } diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 1739047..56f6171 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -1,10 +1,9 @@ # This file contains the HM configuration options for Neovim. {...}: { imports = [ - ./lsp.nix ./filetype.nix ./completion.nix - ./plugins.nix + ./editing-plugins.nix ]; programs.neovim = { diff --git a/home/neovim/editing-plugins.nix b/home/neovim/editing-plugins.nix new file mode 100644 index 0000000..23c7d63 --- /dev/null +++ b/home/neovim/editing-plugins.nix @@ -0,0 +1,26 @@ +# This module sets up and configures various miscellaneous plugins. +# TODO: I fear this file will become the utils.lua of my Neovim configuration. Remove it! +{pkgs, ...}: { + programs.neovim.plugins = [ + { + plugin = pkgs.vimPlugins.vim-localvimrc; + type = "viml"; + config = '' + let g:localvimrc_persistent = 1 + let g:localvimrc_name = [ "local.vim", "editors/local.vim" ] + ''; + } + { + plugin = pkgs.vimPlugins.vim-sneak; + type = "viml"; + config = '' + let g:sneak#s_next = 1 + let g:sneak#use_ic_scs = 1 + map f <Plug>Sneak_f + map F <Plug>Sneak_F + map t <Plug>Sneak_t + map T <Plug>Sneak_T + ''; + } + ]; +} diff --git a/hosts/muhammed/configuration.nix b/hosts/muhammed/configuration.nix index 9119a55..c629b22 100644 --- a/hosts/muhammed/configuration.nix +++ b/hosts/muhammed/configuration.nix @@ -1,5 +1,9 @@ # This file contains the configuration for my Macbook Pro. {flakeInputs, ...}: { + imports = [ + ./home + ]; + # Specify the location of this configuration file. Very meta. environment.darwinConfig = flakeInputs.self + "/hosts/muhammed/configuration.nix"; diff --git a/hosts/muhammed/home/default.nix b/hosts/muhammed/home/default.nix new file mode 100644 index 0000000..b0b126c --- /dev/null +++ b/hosts/muhammed/home/default.nix @@ -0,0 +1,10 @@ +# Here we extend the HM user defined in `home/default.nix`. All the global HM +# stuff is defined in there. +{...}: { + home-manager.users.linus = { + imports = [ + ./iterm2 + ./noweb + ]; + }; +} diff --git a/home/iterm2/default.nix b/hosts/muhammed/home/iterm2/default.nix index d868e57..d868e57 100644 --- a/home/iterm2/default.nix +++ b/hosts/muhammed/home/iterm2/default.nix diff --git a/home/neovim/plugins.nix b/hosts/muhammed/home/neovim/conjure.nix index 54f6d9d..0acfadd 100644 --- a/home/neovim/plugins.nix +++ b/hosts/muhammed/home/neovim/conjure.nix @@ -1,28 +1,6 @@ -# This module sets up and configures various miscellaneous plugins. -# TODO: I fear this file will become the utils.lua of my Neovim configuration. Remove it! {pkgs, ...}: { programs.neovim.plugins = [ { - plugin = pkgs.vimPlugins.vim-localvimrc; - type = "viml"; - config = '' - let g:localvimrc_persistent = 1 - let g:localvimrc_name = [ "local.vim", "editors/local.vim" ] - ''; - } - { - plugin = pkgs.vimPlugins.vim-sneak; - type = "viml"; - config = '' - let g:sneak#s_next = 1 - let g:sneak#use_ic_scs = 1 - map f <Plug>Sneak_f - map F <Plug>Sneak_F - map t <Plug>Sneak_t - map T <Plug>Sneak_T - ''; - } - { # Add interactive repl-like environment. # See also the addition of cmp-conjure in `completion.nix`. # See also the addition of clojure in `dev-utils/default.nix`. @@ -86,5 +64,8 @@ vim.cmd [[autocmd User ConjureEval if expand("%:t") =~ "^conjure-log-" | exec "normal G" | endif]] ''; } + + # Compe plugin to interact with conjure. + pkgs.vimPlugins.cmp-conjure ]; } diff --git a/hosts/muhammed/home/neovim/default.nix b/hosts/muhammed/home/neovim/default.nix new file mode 100644 index 0000000..905896c --- /dev/null +++ b/hosts/muhammed/home/neovim/default.nix @@ -0,0 +1,8 @@ +# Once again we extend the global configuration defined in `home/neovim/` with +# some stuff specific to this host (mainly development stuff). +{...}: { + imports = [ + ./lsp.nix + ./conjure.nix + ]; +} diff --git a/home/neovim/lsp.nix b/hosts/muhammed/home/neovim/lsp.nix index 0c2e290..06745da 100644 --- a/home/neovim/lsp.nix +++ b/hosts/muhammed/home/neovim/lsp.nix @@ -1,6 +1,4 @@ -# This module sets up LSP server configurations for Neovim. It is waaay -# overcomplicated as it kind of turned into an experiment in generating Lua -# code from a Nix attrset. +# This module sets up LSP server configurations for Neovim. {pkgs, ...}: { programs.neovim.plugins = [ { diff --git a/home/noweb/default.nix b/hosts/muhammed/home/noweb/default.nix index ef67862..ef67862 100644 --- a/home/noweb/default.nix +++ b/hosts/muhammed/home/noweb/default.nix |