diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/default.nix | 2 | ||||
| -rw-r--r-- | modules/global.nix | 9 | ||||
| -rw-r--r-- | modules/neovide.nix | 3 | ||||
| -rw-r--r-- | modules/neovim/nvim/lua/config/colorscheme.lua | 1 | ||||
| -rw-r--r-- | modules/neovim/nvim/lua/config/lsp.lua | 5 | ||||
| -rw-r--r-- | modules/qutebrowser/default.nix | 13 | ||||
| -rw-r--r-- | modules/sway/default.nix | 11 | ||||
| -rw-r--r-- | modules/zsh.nix | 27 |
8 files changed, 45 insertions, 26 deletions
diff --git a/modules/default.nix b/modules/default.nix index dc6912b..9341547 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -4,8 +4,8 @@ ./foot.nix ./mako.nix ./neovide.nix + ./zsh.nix ./sway ./neovim - ./qutebrowser ]; } diff --git a/modules/global.nix b/modules/global.nix index 76177e3..ff39759 100644 --- a/modules/global.nix +++ b/modules/global.nix @@ -28,6 +28,9 @@ in sway = { wrapWithNixGL = cfg.notNixOS; }; + # qutebrowser = { + # wrapWithNixGL = cfg.notNixOS; + # }; }; nixGL = lib.mkIf cfg.notNixOS { @@ -35,9 +38,9 @@ in defaultWrapper = "mesa"; }; - programs = { - home-manager.enable = true; - }; + # programs = { + # home-manager.enable = true; + # }; targets.genericLinux.enable = cfg.notNixOS; diff --git a/modules/neovide.nix b/modules/neovide.nix index 14a7aa4..b7694e4 100644 --- a/modules/neovide.nix +++ b/modules/neovide.nix @@ -5,12 +5,13 @@ in { options.modules.neovide = { enable = lib.mkEnableOption "neovide"; + wrapWithNixGL = lib.mkEnableOption "NixGL wrapper"; }; config = { programs.neovide = lib.mkIf cfg.enable { enable = true; - package = config.lib.nixGL.wrap pkgs.neovide; + package = if cfg.wrapWithNixGL then config.lib.nixGL.wrap pkgs.neovide else pkgs.neovide; settings = { title-hidden = true; font = { diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua index 026c0ed..0636088 100644 --- a/modules/neovim/nvim/lua/config/colorscheme.lua +++ b/modules/neovim/nvim/lua/config/colorscheme.lua @@ -7,7 +7,6 @@ vim.cmd[[ hi FloatBorder guifg=#4c4c4c hi Pmenu guibg=#0d0d0d hi BlinkCmpMenuBorder guifg=#4c4c4c - hi BlinkCmpDocBorder guifg=#4c4c4c hi PmenuSel guibg=#191919 guifg=#cacaca hi WinBar guifg=#4c4c4c hi WinSeparator guifg=#191919 diff --git a/modules/neovim/nvim/lua/config/lsp.lua b/modules/neovim/nvim/lua/config/lsp.lua index 5effdc9..f895a8b 100644 --- a/modules/neovim/nvim/lua/config/lsp.lua +++ b/modules/neovim/nvim/lua/config/lsp.lua @@ -1,5 +1,3 @@ -local methods = vim.lsp.protocol.Methods - local servers = { clangd = {}, zls = {} @@ -13,7 +11,7 @@ require('blink.cmp').setup({ }, completion = { list = { - selection = { preselect = true, auto_insert = true }, + selection = { preselect = true, auto_insert = false }, }, menu = { border = "rounded", @@ -22,6 +20,7 @@ require('blink.cmp').setup({ documentation = { window = { border = 'rounded' } }, }, signature = { window = { border = 'rounded' } }, + fuzzy = { implementation = "prefer_rust" } }) vim.diagnostic.config({ diff --git a/modules/qutebrowser/default.nix b/modules/qutebrowser/default.nix deleted file mode 100644 index 283ea80..0000000 --- a/modules/qutebrowser/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, pkgs, inputs, ... }: -let - cfg = config.modules.qutebrowser; -in -{ - config = { - programs.qutebrowser = { - enable = true; - package = config.lib.nixGL.wrap pkgs.qutebrowser; - loadAutoconfig = true; - }; - }; -} diff --git a/modules/sway/default.nix b/modules/sway/default.nix index fb8efa0..55ef601 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -65,6 +65,9 @@ in mode = "2880x1920@120.00Hz"; scale = "2.0"; }; + "DP-2" = { + mode = "1920x1080@239.761Hz"; + }; }; colors = { @@ -236,10 +239,10 @@ in startup = [ { command = "foot -s"; } { command = "wayneko --layer bottom --follow-pointer true --background-colour 0xcacaca --outline-colour 0x0f0f0f"; } - { command = "pipewire"; always = true; } # TODO need to fix this instead of running a new session every time - { command = "mpd"; } - { command = "mpdscribble"; } - { command = "avizo-service"; } # disable if on nixos or systemd +# { command = "pipewire"; always = true; } # TODO need to fix this instead of running a new session every time +# { command = "mpd"; } +# { command = "mpdscribble"; } +# { command = "avizo-service"; } # disable if on nixos or systemd ]; seat = { diff --git a/modules/zsh.nix b/modules/zsh.nix new file mode 100644 index 0000000..5085263 --- /dev/null +++ b/modules/zsh.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.modules.zsh; +in +{ + options.modules.zsh = { + enable = lib.mkEnableOption "zsh"; + }; + + config = { + home.packages = with pkgs; [ + zsh + oh-my-zsh + zsh-autosuggestions + ]; + + programs.zsh = lib.mkIf cfg.enable { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + oh-my-zsh = { + enable = true; + theme = "lambda"; + }; + }; + }; +} |