diff --git a/configuration.nix b/configuration.nix index 7ae25d8..061e864 100644 --- a/configuration.nix +++ b/configuration.nix @@ -72,6 +72,11 @@ in }; services = { + xserver = { + enable = true; + displayManager.startx.enable = true; + windowManager.i3.enable = true; + }; libinput = { enable = true; }; @@ -221,6 +226,7 @@ in cava vesktop pacman + wf-recorder ]; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index f5db0f6..446e08b 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -2,7 +2,8 @@ { imports = [ ./editors/nvim/default.nix - ./wm/sway/default.nix + #./wm/sway/default.nix + ./wm/i3/default.nix ./bash.nix ./git.nix ./tmux.nix diff --git a/modules/nix/editors/nvim/default.nix b/modules/nix/editors/nvim/default.nix index 6eb09be..3fba9e5 100644 --- a/modules/nix/editors/nvim/default.nix +++ b/modules/nix/editors/nvim/default.nix @@ -18,38 +18,14 @@ in ./lsp.nix ./neotree.nix ./opts.nix - ./lualine.nix ./dev.nix ./nonels.nix ./treesitter.nix ]; programs.nixvim = { enable = true; + colorschemes.oxocarbon.enable = true; plugins = { - transparent = { - enable = false; - settings = { - groups = [ - "Normal" - "NormalNC" - "CursorLine" - "StatusLine" - "StatusLineNC" - "EndOfBuffer" - - ]; - exclude_groups = [ ]; - extra_groups = [ - "BufferLineTabClose" - "BufferLineBufferSelected" - "BufferLineFill" - "BufferLineBackground" - "BufferLineSeparator" - "BufferLineIndicatorSelected" - ]; - }; - }; - neocord = { enable = true; settings = { diff --git a/modules/nix/editors/nvim/lualine.nix b/modules/nix/editors/nvim/lualine.nix new file mode 100644 index 0000000..6a69eaf --- /dev/null +++ b/modules/nix/editors/nvim/lualine.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: +{ + programs.nixvim = { + plugins = { + lualine = { + enable = true; + }; + }; + }; +} diff --git a/modules/nix/editors/nvim/opts.nix b/modules/nix/editors/nvim/opts.nix index 2408289..64f0b8e 100644 --- a/modules/nix/editors/nvim/opts.nix +++ b/modules/nix/editors/nvim/opts.nix @@ -16,13 +16,6 @@ map('v', '', '>gv', opts) map('v', '', '