diff options
| -rw-r--r-- | hosts/configuration.nix | 9 | ||||
| -rw-r--r-- | hosts/home.nix | 17 | ||||
| -rw-r--r-- | modules/xorg/default.nix | 1 | ||||
| -rw-r--r-- | overlays/base.nix | 17 | ||||
| -rw-r--r-- | shells/lua.nix | 2 | ||||
| -rw-r--r-- | shells/zig.nix | 2 |
6 files changed, 24 insertions, 24 deletions
diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 4b85fda..738867d 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -42,8 +42,6 @@ extraGroups = [ "wheel" "audio" "video" ]; # Enable ‘sudo’ for the user. }; - #nixpkgs.config.allowUnfree = true; - environment.variables = { TERMINAL = "st"; EDITOR = "nvim"; @@ -70,14 +68,15 @@ pciutils gnupg git-crypt + neovim ]; - programs.neovim = { + /*programs.neovim = { enable = true; viAlias = true; vimAlias = true; - # plugins = with pkgs.vimPlugins; [vim-addon-nix youcompleteme]; - }; + plugins = with pkgs.vimPlugins; [vim-addon-nix youcompleteme]; + };*/ # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/hosts/home.nix b/hosts/home.nix index fa1438b..6240dfa 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -63,21 +63,6 @@ in obs-studio = { enable = true; }; - neovim = { - enable = true; - viAlias = true; - vimAlias = true; - withPython3 = true; - plugins = with pkgs.vimPlugins; [ - vim-addon-nix - YouCompleteMe - nerdtree - rainbow_parentheses - base16-vim - vim-orgmode - ]; - }; - zsh = { enable = true; zplug = { @@ -168,6 +153,4 @@ in sha256 = "sha256-YKpIno5QSJM/GGp5DwQeuhKmTU5S96+IhLr0O0V8PDI="; }; }; - - xsession.enable = true; } diff --git a/modules/xorg/default.nix b/modules/xorg/default.nix index e5fd446..aeb4301 100644 --- a/modules/xorg/default.nix +++ b/modules/xorg/default.nix @@ -27,4 +27,5 @@ }; systemd.user.services.polkit-gnome-authentication-agent-1.enable = true; + #xsession.enable = true; NOT NEEDED RIGHT } diff --git a/overlays/base.nix b/overlays/base.nix index 1ad82c6..8685995 100644 --- a/overlays/base.nix +++ b/overlays/base.nix @@ -25,4 +25,21 @@ final: prev: sha256 = "sha256-J5JwuQMdDU4Oy7let0IYA2rwOZD057LEE+sOmmGCkqc="; }; }); + + neovim = prev.neovim.override { + vimAlias = true; + configure = { + packages.myPlugins = with prev.vimPlugins; { + start = [ + vim-addon-nix + YouCompleteMe + nerdtree + rainbow_parentheses + base16-vim + vim-orgmode + ]; + opt = [ ]; + }; + }; + }; } diff --git a/shells/lua.nix b/shells/lua.nix index ea68530..215ed7e 100644 --- a/shells/lua.nix +++ b/shells/lua.nix @@ -4,4 +4,4 @@ pkgs.mkShell { buildInputs = with pkgs; [ lua ]; -} \ No newline at end of file +} diff --git a/shells/zig.nix b/shells/zig.nix index 2f0f6a7..85b626c 100644 --- a/shells/zig.nix +++ b/shells/zig.nix @@ -4,4 +4,4 @@ pkgs.mkShell { buildInputs = with pkgs; [ zig ]; -} \ No newline at end of file +} |