many changes

10 files changed, 210 insertions, 41 deletions

diff --git a/modules/colors/bright.nix b/modules/colors/bright.nix
new file mode 100644
index 0000000..2b0a18a
--- /dev/null
+++ b/modules/colors/bright.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.modules.colors.bright;
+  hexColorRegex = ''#([0-9a-fA-F]{3}){1,2}'';
+  hexColor = {
+    type = lib.types.strMatching hexColorRegex;
+  };
+in
+{
+  options.modules.colors.bright = {
+    enable = lib.mkEnableOption "bright theme";
+  };
+  config = lib.mkIf cfg.enable {
+    modules.scheme = {
+      name = "base16-bright";
+      base00 = "#000000";
+      base01 = "#303030";
+      base02 = "#505050";
+      base03 = "#b0b0b0";
+      base04 = "#d0d0d0";
+      base05 = "#e0e0e0";
+      base06 = "#f5f5f5";
+      base07 = "#ffffff";
+      base08 = "#fb0120";
+      base09 = "#fc6d24";
+      base0A = "#fda331";
+      base0B = "#a1c659";
+      base0C = "#76c7b7";
+      base0D = "#6fb3d2";
+      base0E = "#d381c3";
+      base0F = "#be643c";
+    };
+  };
+}
diff --git a/modules/colors/default.nix b/modules/colors/default.nix
index 428600f..2bc069d 100644
--- a/modules/colors/default.nix
+++ b/modules/colors/default.nix
@@ -7,5 +7,7 @@
     ./google-dark.nix
     ./grayscale-light.nix
     ./grayscale-dark.nix
+    ./evenok-dark.nix
+    ./bright.nix
   ];
 }
diff --git a/modules/colors/evenok-dark.nix b/modules/colors/evenok-dark.nix
new file mode 100644
index 0000000..33c0f86
--- /dev/null
+++ b/modules/colors/evenok-dark.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.modules.colors.evenok-dark;
+  hexColorRegex = ''#([0-9a-fA-F]{3}){1,2}'';
+  hexColor = {
+    type = lib.types.strMatching hexColorRegex;
+  };
+in
+{
+  options.modules.colors.evenok-dark = {
+    enable = lib.mkEnableOption "evenok-dark theme";
+  };
+  config = lib.mkIf cfg.enable {
+    modules.scheme = {
+      name = "base16-evenok-dark";
+        base00 = "#000000";
+        base01 = "#202020";
+        base02 = "#303030";
+        base03 = "#505050";
+        base04 = "#b0b0b0";
+        base05 = "#d0d0d0";
+        base06 = "#e0e0e0";
+        base07 = "#ffffff";
+        base08 = "#f5708a";
+        base09 = "#ee8122";
+        base0A = "#b8a300";
+        base0B = "#54bc5c";
+        base0C = "#00bab3";
+        base0D = "#00aff2";
+        base0E = "#9095ff";
+        base0F = "#d47ada";
+    };
+  };
+}
diff --git a/modules/colors/mountain.nix b/modules/colors/mountain.nix
index 7a8e9fa..881a1f4 100644
--- a/modules/colors/mountain.nix
+++ b/modules/colors/mountain.nix
@@ -30,36 +30,6 @@ in
       base0D = "#8f8aac";
       base0E = "#ac8aac";
       base0F = "#ac8a8c";
-      # extraVimConfig = 
-      # ''
-      #   hi LineNr guifg=#ceb188
-      #   hi LineNrAbove guifg=#262626
-      #   hi LineNrBelow guifg=#262626
-      #   hi CursorLineNr guifg=#ceb188 guibg=#191919 gui=bold
-      #   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
-      #   "
-      #   "" status line
-      #   hi StatusLine guibg=#191919 guifg=#4c4c4c
-      #   hi StatuslineInactive guibg=#191919 guifg=#4c4c4c gui=NONE
-      #   hi StatuslineAccent guifg=#0f0f0f guibg=#aca98a gui=bold
-      #   hi StatuslineInsertAccent guifg=#0f0f0f guibg=#8aabac gui=bold
-      #   hi StatuslineVisualAccent guifg=#0f0f0f guibg=#8f8aac gui=bold
-      #   hi StatuslineReplaceAccent guifg=#0f0f0f guibg=#ac8a8c gui=bold
-      #   hi StatuslineTerminalAccent guifg=#0f0f0f guibg=#ac8a8c gui=bold
-      #   hi StatuslineCommandAccent guifg=#0f0f0f guibg=#8aac8b gui=bold
-      #   hi StatuslineFileIcon guibg=#191919 guifg=#8f8aac
-      #   hi StatuslineInfo guibg=#191919 guifg=#4c4c4c 
-      #   hi LspError guibg=#191919 guifg=#c49ea0
-      #   hi LspWarn guibg=#191919 guifg=#8f8aac
-      #   hi LspInfo guibg=#191919 guifg=#8f8aac
-      #   hi LspHint guibg=#191919 guifg=#8aabac
-      # '';
     };
   };
 }
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 8a597c5..179bb1c 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -33,6 +33,7 @@ in
       recursive = true;
     };
 
+    # home.sessionVariables.MANPAGER = "nvim +Man!";
 
     programs.neovim = {
       enable = true;
@@ -75,7 +76,8 @@ in
         mini-icons
         oil-nvim
         nvim-lspconfig
-        base16-nvim
+        # tinted-vim
+        base16-vim
         telescope-nvim
         telescope-fzf-native-nvim
         # fzf-lua
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 05bbc1f..7448dc4 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -39,8 +39,11 @@ vim.o.mouse=""
 vim.o.swapfile=false
 vim.opt.foldmethod = "expr"
 vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+
 --vim.opt.foldcolumn = "0"
 vim.opt.foldlevel = 99
+vim.opt.foldlevelstart = 99
+vim.opt.foldenable=true
 -- vim.cmd[[syntax off]]
 -- vim.o.winborder = 'rounded' breaks telescope
 
@@ -78,4 +81,5 @@ vim.api.nvim_set_hl(0, 'Delimiter', {})
 vim.api.nvim_set_hl(0, 'Debug', {})
 -- vim.api.nvim_set_hl(0, 'Underlined', {})
 
-vim.cmd[[cnoreabbrev ts 'lua vim.treesitter.start()']]
+vim.cmd[[cnoreabbrev ts lua vim.treesitter.start()]]
+
diff --git a/modules/neovim/nvim/lua/config/statusline.lua b/modules/neovim/nvim/lua/config/statusline.lua
index 0003383..3f29aa2 100644
--- a/modules/neovim/nvim/lua/config/statusline.lua
+++ b/modules/neovim/nvim/lua/config/statusline.lua
@@ -4,7 +4,7 @@ local modes = {
   ["nt"] = "",
   ["v"] = "VISUAL",
   ["V"] = "VISUAL-LINE",
-  [""] = "VISUAL-BLOCK",
+  [""] = "VISUAL-BLOCK",
   ["s"] = "SELECT",
   ["S"] = "SELECT-LINE",
   [""] = "SELECT-BLOCK",
diff --git a/modules/qutebrowser/config.py b/modules/qutebrowser/config.py
index 1baaabe..6c3ee83 100644
--- a/modules/qutebrowser/config.py
+++ b/modules/qutebrowser/config.py
@@ -1,5 +1,6 @@
 config.unbind('k')
 config.bind(',v', 'hint links spawn mpv {hint-url}')
+# TODO: caret
 config.bind('m', 'scroll left')
 config.bind('n', 'scroll down')
 config.bind('e', 'scroll up')
@@ -13,12 +14,54 @@ config.bind('j', 'search-next')
 config.bind('J', 'search-prev')
 config.bind('l', 'mode-enter insert')
 
-c.tabs.show = 'never'
-c.tabs.tabs_are_windows = True
-c.tabs.last_close = 'close'
-c.fonts.default_family = 'BerkeleyMonoPatched Nerd Font Propo'
-c.fonts.default_size: '13pt'
+c.fonts.default_family = 'GoMono Nerd Font Propo'
+c.fonts.prompts = '11pt GoMono Nerd Font Propo'
+c.fonts.default_size = '11pt'
 c.hints.chars = 'arstneio'
+c.hints.radius=0
+
+c.keyhint.radius=0
+c.completion.scrollbar.width=0
+c.completion.show="always"
+c.completion.shrink=True
+c.content.autoplay=False
+c.content.fullscreen.window=True
+c.content.pdfjs=True
+c.content.prefers_reduced_motion=True
+c.downloads.location.directory="~/dl"
+c.editor.command=["neovide", "{file}", "--", "-c", "normal {line}G{column0}l"]
+c.prompt.filebrowser=False
+c.prompt.radius=0
+c.scrolling.bar="never"
+c.scrolling.smooth=True
+c.search.incremental=False
+c.search.wrap=False
+c.search.wrap_messages=False
+
+# c.statusbar.show="in-mode"
+c.statusbar.widgets = ["search_match", "url", "scroll"]
+
 c.tabs.favicons.show = 'never'
 c.tabs.indicator.width = 0
 c.tabs.title.alignment = 'center'
+c.tabs.last_close='ignore'
+c.tabs.mousewheel_switching=False
+c.tabs.show = 'multiple'
+# c.tabs.tabs_are_windows = False
+c.tabs.tabs_are_windows = True
+c.tabs.title.format = "{audio}{index}:{current_title}"
+
+c.url.default_page = "about:blank"
+c.url.start_pages = "about:blank"
+c.url.searchengines = {
+    "DEFAULT": "https://duckduckgo.com/?q={}", 
+    "nix": "https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query={}",
+    "void": "https://voidlinux.org/packages/?arch=x86_64&q={}",
+    "wiki": "https://en.wikipedia.org/wiki/Special:Search?&search={}",
+    "lean": "https://loogle.lean-lang.org/?q={}",
+    "arxiv": "https://arxiv.org/search/?query={}&source=header&searchtype=all",
+    "disc": "https://www.discogs.com/search?q={}",
+    "rym": "https://rateyourmusic.com/search?searchterm={}&searchtype=",
+}
+
+c.window.title_format = "{audio} {current_title}"
diff --git a/modules/qutebrowser/default.nix b/modules/qutebrowser/default.nix
index 4d2e87d..9fdeeef 100644
--- a/modules/qutebrowser/default.nix
+++ b/modules/qutebrowser/default.nix
@@ -2,6 +2,10 @@
 let
   cfg = config.modules.qutebrowser;
   scheme = config.modules.scheme;
+  fg = "${scheme.base05}";
+  fg2 = "${scheme.base03}";
+  bg = "${scheme.base00}";
+  bg2 = "${scheme.base02}";
 in
 {
   options.modules.qutebrowser = {
@@ -16,10 +20,85 @@ in
       loadAutoconfig = false;
       extraConfig = ''
         ${builtins.readFile ./config.py}
-        c.colors.completion.category.bg = "${scheme.base00}";
-        c.colors.completion.category.border.top = "${scheme.base00}";
-        c.colors.completion.category.border.bottom = "${scheme.base00}";
+        c.colors.completion.category.bg = "${bg2}"
+        c.colors.completion.even.bg = "${bg}"
+        c.colors.completion.odd.bg = "${bg}"
+        c.colors.completion.category.fg = "${fg}"
+        c.colors.completion.item.selected.fg = "${fg}"
+        c.colors.completion.item.selected.bg = "${bg}"
+        c.colors.completion.item.selected.match.fg = "${fg}"
+        c.colors.completion.item.selected.border.top = "${bg}"
+        c.colors.completion.item.selected.border.bottom = "${bg}"
+        c.colors.completion.fg = "${fg2}"
+        c.colors.completion.match.fg = "${fg2}"
+
+        c.colors.downloads.bar.bg = "${bg}"
+        c.colors.downloads.bar.bg = "${bg}"
+        c.colors.downloads.error.bg = "${scheme.base08}"
+        c.colors.downloads.error.fg = "${bg}"
+        c.colors.downloads.start.bg = "${bg2}"
+        c.colors.downloads.start.fg = "${fg}"
+        c.colors.downloads.stop.bg = "${bg2}"
+        c.colors.downloads.stop.fg = "${fg}"
+        
+        c.colors.hints.bg = "${scheme.base0D}"
+        c.colors.hints.fg = "${bg}"
+        c.colors.hints.match.fg = "${bg2}"
+
+        c.colors.keyhint.bg = "${bg2}"
+        c.colors.keyhint.fg = "${fg}"
+        c.colors.keyhint.suffix.fg = "${scheme.base0D}"
+
+        c.colors.messages.error.bg = "${scheme.base08}"
+        c.colors.messages.error.fg = "${bg}"
+
+        c.colors.prompts.bg = "${bg}"
+        c.colors.prompts.selected.bg = "${bg}"
+        c.colors.prompts.fg = "${fg2}"
+        c.colors.prompts.selected.fg = "${fg2}"
+        c.colors.prompts.border = "0px solid grey"
+
+        # c.colors.statusbar.caret.bg = "${scheme.base0E}"
+        c.colors.statusbar.caret.bg = "${bg2}"
+        c.colors.statusbar.caret.fg = "${fg}"
+        c.colors.statusbar.caret.selection.bg = "${bg2}"
+        c.colors.statusbar.caret.selection.fg = "${fg}"
+
+        c.colors.statusbar.command.bg = "${bg2}"
+        c.colors.statusbar.command.fg = "${fg}"
+        c.colors.statusbar.command.private.bg = "${bg2}"
+        c.colors.statusbar.command.private.fg = "${fg}"
+        c.colors.statusbar.insert.bg = "${bg2}"
+        c.colors.statusbar.insert.fg = "${fg}"
+        c.colors.statusbar.normal.bg = "${bg2}"
+        c.colors.statusbar.normal.fg = "${fg}"
+        c.colors.statusbar.passthrough.bg = "${bg2}"
+        c.colors.statusbar.passthrough.fg = "${fg}"
+        c.colors.statusbar.private.bg = "${bg2}"
+        c.colors.statusbar.private.fg = "${fg}"
+        c.colors.statusbar.progress.bg = "${bg2}"
+        c.colors.statusbar.url.fg = "${fg}"
+        c.colors.statusbar.url.success.http.fg = "${fg}"
+        c.colors.statusbar.url.success.https.fg = "${fg}"
+        c.colors.statusbar.url.warn.fg = "${fg}"
+        c.colors.statusbar.url.error.fg = "${scheme.base08}"
+        c.colors.statusbar.url.hover.fg = "${scheme.base0D}"
+
+        c.colors.tabs.bar.bg = "${bg}"
+        c.colors.tabs.even.bg = "${bg}"
+        c.colors.tabs.odd.bg = "${bg}"
+        c.colors.tabs.even.fg = "${fg2}"
+        c.colors.tabs.odd.fg = "${fg2}"
+        c.colors.tabs.selected.even.bg = "${bg}"
+        c.colors.tabs.selected.odd.bg = "${bg}"
+        c.colors.tabs.selected.even.fg = "${fg}"
+        c.colors.tabs.selected.odd.fg = "${fg}"
+        c.colors.webpage.bg = "${bg}"
+        c.colors.completion.category.border.top = "${bg2}";
+        c.colors.completion.category.border.bottom = "${bg2}";
         c.colors.webpage.preferred_color_scheme = "${if scheme.light then "light" else "dark"}"
+
+        c.hints.border="${fg}"
       '';
     };
   };
diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix
index ea0dce9..10777bb 100644
--- a/modules/zsh/default.nix
+++ b/modules/zsh/default.nix
@@ -44,6 +44,7 @@ in
         lg = "NO_COLOR= lazygit";
         gdb = "gdb -q";
         py = "ipython3";
+        fetch = "fastfetch";
       };
       autosuggestion.enable = true;
       initExtra = ''