modules: various fixes

6 files changed, 91 insertions, 80 deletions

diff --git a/modules/email/default.nix b/modules/email/default.nix
index 4b8beec..08a141f 100644
--- a/modules/email/default.nix
+++ b/modules/email/default.nix
@@ -27,6 +27,8 @@ in
       };
       imap = {
         host = "imap.s00.xyz";
+        port = 993;
+        tls.enable = true;
       };
       smtp = {
         host = "smtp.s00.xyz";
diff --git a/modules/foot.nix b/modules/foot.nix
index b07b94c..8a5bbf2 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -36,7 +36,7 @@ in
           blink = "no";
         };
 
-        colors = {
+        colors-dark = {
           # alpha=0.7;
           cursor = (fmt scheme.base00) + " " + (fmt scheme.base05);
           foreground = fmt scheme.base05;
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 1b9e345..606e012 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -115,6 +115,7 @@ in
         nvim-treesitter-parsers.mlir
         nvim-treesitter-parsers.starlark
         nvim-treesitter-context
+        nvim-treesitter-parsers.asm
 
         nvim-treesitter-textobjects
 
@@ -277,49 +278,52 @@ in
         }
       ];
       extraLuaConfig =
-      # lua
-      ''
-        ${builtins.readFile ./nvim/init.lua}
-        require('tinted-nvim').setup({
-          compile = true,
-          default_scheme = "base24-system-theme",
-          capabilities = {
-            undercurl = true,
-          },
-          styles = {
-            comments = { italic = false },
-          },
-          schemes = {
-            ["base24-system-theme"] = {
-              variant = "${if scheme.light then "light" else "dark"}",
-              base00 = "${scheme.base00}",
-              base01 = "${scheme.base01}",
-              base02 = "${scheme.base02}",
-              base03 = "${scheme.base03}",
-              base04 = "${scheme.base04}",
-              base05 = "${scheme.base05}",
-              base06 = "${scheme.base06}",
-              base07 = "${scheme.base07}",
-              base08 = "${scheme.base08}",
-              base09 = "${scheme.base09}",
-              base0A = "${scheme.base0A}",
-              base0B = "${scheme.base0B}",
-              base0C = "${scheme.base0C}",
-              base0D = "${scheme.base0D}",
-              base0E = "${scheme.base0E}",
-              base0F = "${scheme.base0F}",
-              base10 = "${scheme.base10}",
-              base11 = "${scheme.base11}",
-              base12 = "${scheme.base12}",
-              base13 = "${scheme.base13}",
-              base14 = "${scheme.base14}",
-              base15 = "${scheme.base15}",
-              base16 = "${scheme.base16}",
-              base17 = "${scheme.base17}",
-            },
-          },
-        })
-        vim.cmd[[doautocmd ColorScheme]]
+        # lua
+        ''
+          package.preload["tinted-colorscheme"] = function()
+            error(debug.traceback("Something required tinted-colorscheme"))
+          end
+            ${builtins.readFile ./nvim/init.lua}
+            require('tinted-nvim').setup({
+              compile = false,
+              default_scheme = "base24-system-theme",
+              capabilities = {
+                undercurl = true,
+              },
+              styles = {
+                comments = { italic = false },
+              },
+              schemes = {
+                ["base24-system-theme"] = {
+                  variant = "${if scheme.light then "light" else "dark"}",
+                  base00 = "${scheme.base00}",
+                  base01 = "${scheme.base01}",
+                  base02 = "${scheme.base02}",
+                  base03 = "${scheme.base03}",
+                  base04 = "${scheme.base04}",
+                  base05 = "${scheme.base05}",
+                  base06 = "${scheme.base06}",
+                  base07 = "${scheme.base07}",
+                  base08 = "${scheme.base08}",
+                  base09 = "${scheme.base09}",
+                  base0A = "${scheme.base0A}",
+                  base0B = "${scheme.base0B}",
+                  base0C = "${scheme.base0C}",
+                  base0D = "${scheme.base0D}",
+                  base0E = "${scheme.base0E}",
+                  base0F = "${scheme.base0F}",
+                  base10 = "${scheme.base10}",
+                  base11 = "${scheme.base11}",
+                  base12 = "${scheme.base12}",
+                  base13 = "${scheme.base13}",
+                  base14 = "${scheme.base14}",
+                  base15 = "${scheme.base15}",
+                  base16 = "${scheme.base16}",
+                  base17 = "${scheme.base17}",
+                },
+              },
+            })
+            -- vim.cmd[[doautocmd ColorScheme]]
 
         vim.opt.runtimepath:prepend('${tsparsers}')
       '';
diff --git a/modules/neovim/nvim/after/ftplugin/markdown.lua b/modules/neovim/nvim/after/ftplugin/markdown.lua
index 849f933..3cc5d65 100644
--- a/modules/neovim/nvim/after/ftplugin/markdown.lua
+++ b/modules/neovim/nvim/after/ftplugin/markdown.lua
@@ -2,8 +2,8 @@ vim.opt.wrap = true
 vim.opt.number = false
 vim.opt.relativenumber = false
 
-vim.keymap.set({'n', 'v'}, 'n', 'g<Down>', { buffer = true })
-vim.keymap.set({'n', 'v'}, 'e', 'g<Up>', { buffer = true })
+vim.keymap.set({'n', 'v'}, '<C-n>', 'g<Down>', { buffer = true })
+vim.keymap.set({'n', 'v'}, '<C-p>', 'g<Up>', { buffer = true })
 
 vim.opt.statusline="%f"
 vim.opt_local.conceallevel=3
diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua
index b6bd545..b49a24d 100644
--- a/modules/neovim/nvim/lua/config/colorscheme.lua
+++ b/modules/neovim/nvim/lua/config/colorscheme.lua
@@ -2,42 +2,44 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args)
   -- local colors = require('base16-colorscheme').colors
   local colors = require("tinted-nvim").get_palette()
     -- i dislike syntax highlighting
-  -- vim.api.nvim_set_hl(0, 'Comment', {})
-  vim.api.nvim_set_hl(0, 'Constant', {})
-  -- vim.api.nvim_set_hl(0, 'String', {})
-  vim.api.nvim_set_hl(0, 'Character', { link = "String" })
-  vim.api.nvim_set_hl(0, 'Number', {})
-  vim.api.nvim_set_hl(0, 'Boolean', {})
-  vim.api.nvim_set_hl(0, 'Float', {})
-  vim.api.nvim_set_hl(0, 'Identifier', {})
-  vim.api.nvim_set_hl(0, 'Function', {})
-  vim.api.nvim_set_hl(0, 'Statement', {})
-  vim.api.nvim_set_hl(0, 'Conditional', {})
-  vim.api.nvim_set_hl(0, 'Repeat', {})
-  vim.api.nvim_set_hl(0, 'Label', {})
-  vim.api.nvim_set_hl(0, 'Operator', {})
-  vim.api.nvim_set_hl(0, 'Keyword', {})
-  vim.api.nvim_set_hl(0, 'Exception', {})
-  vim.api.nvim_set_hl(0, 'PreProc', {})
-  vim.api.nvim_set_hl(0, 'Include', {})
-  vim.api.nvim_set_hl(0, 'Define', {})
-  vim.api.nvim_set_hl(0, 'Macro', {})
-  vim.api.nvim_set_hl(0, 'PreCondit', {})
-  vim.api.nvim_set_hl(0, 'Type', {})
-  vim.api.nvim_set_hl(0, 'StorageClass', {})
-  vim.api.nvim_set_hl(0, 'Structure', {})
-  vim.api.nvim_set_hl(0, 'Typedef', {})
-  vim.api.nvim_set_hl(0, 'Special', {})
-  vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' })
-  vim.api.nvim_set_hl(0, 'Tag', {})
-  vim.api.nvim_set_hl(0, 'Delimiter', {})
-  -- vim.api.nvim_set_hl(0, 'SpecialComment', {})
-  vim.api.nvim_set_hl(0, 'Debug', {})
-  -- vim.api.nvim_set_hl(0, 'Underlined', {})
+  -- vim.api.nvim_set_hl(0, 'Constant', {})
+  -- vim.api.nvim_set_hl(0, 'Character', { link = "String" })
+  -- vim.api.nvim_set_hl(0, 'Number', {})
+  -- vim.api.nvim_set_hl(0, 'Boolean', {})
+  -- vim.api.nvim_set_hl(0, 'Float', {})
+  -- vim.api.nvim_set_hl(0, 'Identifier', {})
+  -- vim.api.nvim_set_hl(0, 'Function', {})
+  -- vim.api.nvim_set_hl(0, 'Statement', {})
+  -- vim.api.nvim_set_hl(0, 'Conditional', {})
+  -- vim.api.nvim_set_hl(0, 'Repeat', {})
+  -- vim.api.nvim_set_hl(0, 'Label', {})
+  -- vim.api.nvim_set_hl(0, 'Operator', {})
+  -- vim.api.nvim_set_hl(0, 'Keyword', {})
+  -- vim.api.nvim_set_hl(0, 'Exception', {})
+  -- vim.api.nvim_set_hl(0, 'PreProc', {})
+  -- vim.api.nvim_set_hl(0, 'Include', {})
+  -- vim.api.nvim_set_hl(0, 'Define', {})
+  -- vim.api.nvim_set_hl(0, 'Macro', {})
+  -- vim.api.nvim_set_hl(0, 'PreCondit', {})
+  -- vim.api.nvim_set_hl(0, 'Type', {})
+  -- vim.api.nvim_set_hl(0, 'StorageClass', {})
+  -- vim.api.nvim_set_hl(0, 'Structure', {})
+  -- vim.api.nvim_set_hl(0, 'Typedef', {})
+  -- vim.api.nvim_set_hl(0, 'Special', {})
+  -- vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' })
+  -- vim.api.nvim_set_hl(0, 'Tag', {})
+  -- vim.api.nvim_set_hl(0, 'Delimiter', {})
+  -- vim.api.nvim_set_hl(0, 'Debug', {})
   vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base01 })
   vim.api.nvim_set_hl(0, 'WinSeparator', { fg = colors.base01 })
   vim.api.nvim_set_hl(0, 'WinBar', { fg = colors.base03 })
   vim.api.nvim_set_hl(0, 'LineNr', { fg = colors.base02 })
+
+  -- STUFF THAT WAS ALREADY COMMENTED
+  -- vim.api.nvim_set_hl(0, 'Comment', {})
+  -- vim.api.nvim_set_hl(0, 'String', {})
+  -- vim.api.nvim_set_hl(0, 'Underlined', {})
+  -- vim.api.nvim_set_hl(0, 'SpecialComment', {})
   -- vim.api.nvim_set_hl(0, 'LineNrAbove', { fg = colors.base02 })
   -- vim.api.nvim_set_hl(0, 'LineNrBelow', { fg = colors.base02 })
   -- vim.api.nvim_set_hl(0, 'TSVariable', { fg = colors.base05 })
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 7ff9b37..2f90122 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -47,6 +47,7 @@ in
       autotiling
       pamixer
       killall
+      brightnessctl
     ];
     home.sessionVariables.NIXOS_OZONE_WL="1";
     wayland.windowManager.sway = lib.mkIf cfg.enable {
@@ -300,8 +301,10 @@ in
           "--locked XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume > $WOBSOCK && killall -s USR1 -r py3status";
           "--locked XF86AudioMute" =
             ''exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0 > $WOBSOCK ) || pamixer --get-volume > $WOBSOCK && killall -s USR1 -r py3status'';
-          "--locked XF86MonBrightnessUp" = "exec light -A 5 && light -G | cut -d'.' -f1 > $WOBSOCK";
-          "--locked XF86MonBrightnessDown" = "exec light -U 5 && light -G | cut -d'.' -f1 > $WOBSOCK";
+          "--locked XF86MonBrightnessUp" = "exec brightnessctl set 5%+ && brightnessctl -m | cut -d',' -f4 | tr -d '%' > $WOBSOCK";
+          "--locked XF86MonBrightnessDown" = "exec brightnessctl set 5%- && brightnessctl -m | cut -d',' -f4 | tr -d '%' > $WOBSOCK";
+          # "--locked XF86MonBrightnessUp" = "exec light -A 5 && light -G | cut -d'.' -f1 > $WOBSOCK";
+          # "--locked XF86MonBrightnessDown" = "exec light -U 5 && light -G | cut -d'.' -f1 > $WOBSOCK";
         };
 
         startup = cfg.startup;