stuff and things

2025-04-07 13:07:15 -04:00 · 2025-04-07 13:07:15 -04:00 · b5542e492f
commit b5542e492f
parent fe357582a6
36 changed files with 1059 additions and 1069 deletions
--- a/modules/home/apps/helpers/waybar/default.nix
+++ b/modules/home/apps/helpers/waybar/default.nix
@ -497,7 +497,7 @@ in {
          "gtk-layer-shell" = true;
          passthrough = false;
          "fixed-center" = true;
-          "modules-left" = ["hyprland/workspaces" "hyprland/window"];
+          "modules-left" = ["hyprland/workspaces" "hyprland/window" "niri/workspaces" "niri/window"];
          "modules-center" = ["mpris"];
          "modules-right" = [
            "cpu"
--- a/modules/home/apps/term/alacritty/default.nix
+++ b/modules/home/apps/term/alacritty/default.nix
@ -12,22 +12,56 @@ in {
    enable = mkBoolOpt false "Enable Alacritty Term";

    fonts = {
+      # normal = {
+      #   family = mkStringOpt "Cozette" "The Family of the font";
+      #   # style = mkStringOpt "ExtraBold" "The Style of the font";
+      # };
+      # bold = {
+      #   family = mkStringOpt "Cozette" "The Family of the font";
+      #   # style = mkStringOpt "Heavy" "The Style of the font";
+      # };
+      # italic = {
+      #   family = mkStringOpt "Cozette" "The Family of the font";
+      #   # style = mkStringOpt "ExtraBold Italic" "The Style of the font";
+      # };
+      # bold_italic = {
+      #   family = mkStringOpt "Cozette" "The Family of the font";
+      #   # style = mkStringOpt "Heavy Italic" "The Style of the font";
+      # };
+
      normal = {
-        family = mkStringOpt "Iosevka" "The Family of the font";
-        style = mkStringOpt "ExtraBold" "The Style of the font";
+        family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font";
+        style = mkStringOpt "SemiBold SemiExtended" "The Style of the font";
      };
      bold = {
-        family = mkStringOpt "Iosevka" "The Family of the font";
-        style = mkStringOpt "Heavy" "The Style of the font";
+        family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font";
+        style = mkStringOpt "Bold SemiExtended" "The Style of the font";
      };
      italic = {
-        family = mkStringOpt "Iosevka" "The Family of the font";
-        style = mkStringOpt "ExtraBold Italic" "The Style of the font";
+        family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font";
+        style = mkStringOpt "SemiBold Italic SemiExtended" "The Style of the font";
      };
      bold_italic = {
-        family = mkStringOpt "Iosevka" "The Family of the font";
-        style = mkStringOpt "Heavy Italic" "The Style of the font";
+        family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font";
+        style = mkStringOpt "Bold Italic SemiExtended" "The Style of the font";
      };
+
+      # normal = {
+      #   family = mkStringOpt "PragmataPro" "The Family of the font";
+      #   # style = mkStringOpt "" "The Style of the font";
+      # };
+      # bold = {
+      #   family = mkStringOpt "PragmataPro" "The Family of the font";
+      #   style = mkStringOpt "Bold" "The Style of the font";
+      # };
+      # italic = {
+      #   family = mkStringOpt "PragmataPro" "The Family of the font";
+      #   style = mkStringOpt "Italic" "The Style of the font";
+      # };
+      # bold_italic = {
+      #   family = mkStringOpt "PragmataPro" "The Family of the font";
+      #   style = mkStringOpt "Bold Italic" "The Style of the font";
+      # };
    };
  };

@ -37,14 +71,29 @@ in {
      catppuccin.enable = true;

      settings = {
+        colors = {
+          primary.background = "#11111b";
+        };
+        env = {
+          term = "xterm-256color";
+        };
+        cursor = {
+          style = {
+            shape = "Beam";
+          };
+          vi_mode_style = {
+            shape = "Beam";
+          };
+        };
        window = {
-          opacity = 0.95;
+          # opacity = 0.95;
          padding = {
            x = 20;
            y = 20;
          };
        };
        font = {
+          size = 16.0;
          normal = cfg.fonts.normal;
          bold = cfg.fonts.bold;
          italic = cfg.fonts.italic;
--- a/modules/home/apps/term/ghostty/default.nix
+++ b/modules/home/apps/term/ghostty/default.nix
@ -16,10 +16,15 @@ in {
      # bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font";
      # italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font";
      # bold_italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font";
-      normal = mkStringOpt "Pragmata Pro Mono" "Normal Font";
-      bold = mkStringOpt "Iosevka ExtraBold" "Bold Font";
-      italic = mkStringOpt "Iosevka Bold Italic" "Italic Font";
-      bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font";
+      # normal = mkStringOpt "Pragmata Pro Mono" "Normal Font";
+      # bold = mkStringOpt "Pragmata Pro Mono" "Bold Font";
+      # italic = mkStringOpt "Iosevka Bold Italic" "Italic Font";
+      # bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font";
+
+      normal = mkStringOpt "Iosevka" "Normal Font";
+      bold = mkStringOpt "Iosevka" "Bold Font";
+      italic = mkStringOpt "Iosevka" "Italic Font";
+      bold_italic = mkStringOpt "Iosevka" "Bold Italic Font";
    };
  };

--- a/modules/home/apps/term/kitty/default.nix
+++ b/modules/home/apps/term/kitty/default.nix
@ -12,14 +12,18 @@ in {
    enable = mkBoolOpt false "Enable Kitty Term";

    fonts = {
-      normal = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold" "Normal Font";
-      bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font";
-      italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font";
-      bold_italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font";
-      # normal = mkStringOpt "Iosevka Bold" "Normal Font";
-      # bold = mkStringOpt "Iosevka ExtraBold" "Bold Font";
-      # italic = mkStringOpt "Iosevka Bold Italic" "Italic Font";
-      # bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font";
+      # normal = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold" "Normal Font";
+      # bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font";
+      # italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font";
+      # bold_italic = mkStringOpt "JetBrainsMoIosevka ExtraBold ItalicnoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font";
+      # normal = mkStringOpt "Kirsch Nerd Font Mono" "Normal Font";
+      # bold = mkStringOpt "Kirsch Nerd Font Mono" "BBoldold Font";
+      # italic = mkStringOpt "Kirsch Nerd Font Mono" "Italic Font";
+      # bold_italic = mkStringOpt "Kirsch Nerd Font Mono" "Bold Italic Font";
+      normal = mkStringOpt "CozetteVector" "Normal Font";
+      bold = mkStringOpt "CozetteVector" "Bold Font";
+      italic = mkStringOpt "CozetteVector" "Italic Font";
+      bold_italic = mkStringOpt "CozetteVector" "Bold Italic Font";
    };
  };

@ -28,7 +32,7 @@ in {
      enable = true;
      font = {
        name = cfg.fonts.normal;
-        size = 14;
+        size = 16;
      };

      extraConfig = ''
@ -41,7 +45,7 @@ in {

      settings = {
        window_padding_width = 12;
-        background_opacity = "0.9";
+        # background_opacity = "0.9";
        # background = "#000000";
      };
    };
--- a/modules/home/apps/term/rio/default.nix
+++ b/modules/home/apps/term/rio/default.nix
@ -16,7 +16,7 @@ in {
  config = mkIf cfg.enable {
    programs.rio = {
      enable = true;
-      package = inputs.rio-term.packages.${pkgs.system}.default;
+      # package = inputs.rio-term.packages.${pkgs.system}.default;
      settings = {
        window = {
          opacity = 0.9;
--- a/modules/home/apps/tools/neovim/config/lazyvim.json
+++ b/modules/home/apps/tools/neovim/config/lazyvim.json
@ -14,6 +14,7 @@
    "lazyvim.plugins.extras.lang.toml",
    "lazyvim.plugins.extras.lang.json",
    "lazyvim.plugins.extras.lang.clangd",
+    "lazyvim.plugins.extras.lang.rust",
    "lazyvim.plugins.extras.lang.markdown",
    "lazyvim.plugins.extras.lang.nix",
    "lazyvim.plugins.extras.lang.sql",
@ -32,8 +33,9 @@
    "lazyvim.plugins.extras.coding.luasnip",
    "lazyvim.plugins.extras.coding.blink"
  ],
+  "install_version": 8,
  "news": {
-    "NEWS.md": "6520"
+    "NEWS.md": "10960"
  },
  "version": 8
 }
--- a/modules/home/apps/tools/neovim/config/lua/config/lazy.lua
+++ b/modules/home/apps/tools/neovim/config/lua/config/lazy.lua
@ -3,34 +3,7 @@ require("lazy").setup({
    -- add LazyVim and import its plugins
    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
    -- import/override with your plugins
-    -- { import = "lazyvim.plugins.extras.lang.rust" },
-    -- { import = "lazyvim.plugins.extras.lang.json" },
-    -- { import = "lazyvim.plugins.extras.lang.astro" },
-    -- { import = "lazyvim.plugins.extras.lang.git" },
-    -- { import = "lazyvim.plugins.extras.lang.docker" },
-    -- { import = "lazyvim.plugins.extras.lang.clangd" },
-    -- { import = "lazyvim.plugins.extras.lang.cmake" },
-    -- { import = "lazyvim.plugins.extras.lang.haskell" },
-    -- { import = "lazyvim.plugins.extras.lang.java" },
-    -- { import = "lazyvim.plugins.extras.lang.markdown" },
-    -- { import = "lazyvim.plugins.extras.lang.nix" },
-    -- { import = "lazyvim.plugins.extras.lang.sql" },
-    -- { import = "lazyvim.plugins.extras.lang.svelte" },
-    -- { import = "lazyvim.plugins.extras.lang.tailwind" },
-    -- { import = "lazyvim.plugins.extras.lang.tex" },
-    -- { import = "lazyvim.plugins.extras.lang.typescript" },
-    -- { import = "lazyvim.plugins.extras.lang.toml" },
-    -- { import = "lazyvim.plugins.extras.lang.angular" },
-    --
-    -- { import = "lazyvim.plugins.extras.formatting.prettier" },
-    --
-    -- { import = "lazyvim.plugins.extras.coding.luasnip" },
-    -- { import = "lazyvim.plugins.extras.coding.yanky" },
-    --
-    -- { import = "lazyvim.plugins.extras.dap.core" },
    { import = "plugins" },
-    { import = "plugins.extras.rust" },
-    -- { import = "plugins.extras.clangd" },
  },
  defaults = {
    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
--- a/modules/home/apps/tools/neovim/config/lua/config/options.lua
+++ b/modules/home/apps/tools/neovim/config/lua/config/options.lua
@ -9,3 +9,5 @@ end

 -- in this case.
 vim.g.lazyvim_blink_main = true
+
+vim.o.termguicolors = true
--- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua
+++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua
@ -6,61 +6,51 @@ return {
      news = { lazyvim = false },
    },
  },
-  {
-    "drewxs/ash.nvim",
-    lazy = false,
-    priority = 1000,
-  },
-  {
-    "dgox16/oldworld.nvim",
-    lazy = false,
-    priority = 1000,
-  },
-  {
-    "snacks.nvim",
-    opts = {
-      scroll = {
-        enabled = false,
-      },
-      dashboard = {
-        preset = {
-          header = [[
-          ／l、             
-       （ﾟ､ ｡ ７         
-      l  ~ヽ       
-  じしf_,)ノ
-        ]],
-        },
-      },
-    },
-  },
-  -- {
-  --   "uZer/pywal16.nvim",
-  --   -- for local dev replace with:
-  --   -- dir = '~/your/path/pywal16.nvim',
-  --   config = function()
-  --     vim.cmd.colorscheme("pywal16")
-  --   end,
-  -- },
  {
    "catppuccin",
-    opts = {
-      transparent_background = true,
-      integrations = {
-        blink_cmp = true,
-      },
-      -- color_overrides = {
-      --   mocha = {
-      --     base = "#000000",
-      --     mantle = "#000000",
-      --     crust = "#000000",
-      --   },
-      -- },
-    },
+    config = function()
+      require("catppuccin").setup({
+        transparent_background = false,
+        integrations = {
+          blink_cmp = true,
+          nvimtree = true,
+        },
+        custom_highlights = function(colors)
+          return {
+            Normal = { bg = colors.crust },
+            NormalFloat = { bg = colors.crust },
+
+            -- Completion menu (nvim-cmp)
+            Pmenu = { bg = colors.crust },
+            PmenuSel = { bg = colors.surface0 },
+            CmpItemAbbr = { bg = colors.crust },
+            CmpItemAbbrMatch = { bg = colors.crust },
+
+            -- Tabs
+            TabLine = { bg = colors.crust },
+            TabLineFill = { bg = colors.crust },
+            TabLineSel = { bg = colors.crust },
+
+            -- Status line
+            StatusLine = { bg = colors.crust },
+            StatusLineNC = { bg = colors.crust },
+
+            -- Line numbers
+            LineNr = { bg = colors.crust },
+            SignColumn = { bg = colors.crust },
+          }
+        end,
+        color_overrides = {
+          mocha = {
+            base = "#11111b",
+            mantle = "#11111b",
+            crust = "#11111b",
+          },
+        },
+      })
+    end,
  },
  "f-person/git-blame.nvim",
-  { "nvim-lualine/lualine.nvim", enabled = false },
-  { "echasnovski/mini.statusline", opts = {} },
  {
    "stevearc/conform.nvim",
    opts = {
@ -75,41 +65,20 @@ return {
      },
    },
  },
-  {
-    "folke/snacks.nvim",
-    priority = 1000,
-    lazy = false,
-    keys = {
-      {
-        "<leader>z",
-        function()
-          Snacks.zen()
-        end,
-        desc = "Toggle Zen Mode",
-      },
-    },
-  },
-  {
-    "lukas-reineke/indent-blankline.nvim",
-    main = "ibl",
-    tag = "v3.8.2",
-    ---@module "ibl"
-    ---@type ibl.config
-    -- opts = {
-    --   debounce = 100,
-    --   indent = { char = "|" },
-    --   whitespace = { highlight = "Whitespace", "NonText" },
-    -- },
-  },
  {
    "neovim/nvim-lspconfig",
+    ---@class PluginLspOpts
    opts = {
      servers = {
        emmet_ls = {},
-        slang = {
-          inlayHints = {
-            deducedTypes = true,
-            paramaterNames = true,
+        slangd = {
+          settings = {
+            slangd = {
+              inlayHints = {
+                deducedTypes = true,
+                paramaterNames = true,
+              },
+            },
          },
        },
        nil_ls = {
@ -145,10 +114,4 @@ return {
      require("force-cul").setup()
    end,
  },
-  -- {
-  --   "supermaven-inc/supermaven-nvim",
-  --   config = function()
-  --     require("supermaven-nvim").setup({})
-  --   end,
-  -- },
 }
--- a/modules/home/apps/tools/tmux/default.nix
+++ b/modules/home/apps/tools/tmux/default.nix
@ -16,10 +16,10 @@ in {
  config = mkIf cfg.enable {
    catppuccin.tmux = {
      enable = true;
-      # extraConfig = ''
-      #   set -g @catppuccin_window_status_style "basic"
-      #   set -g @catppuccin_status_background "#000000"
-      # '';
+      extraConfig = ''
+        set -g @catppuccin_window_status_style "basic"
+        set -g @catppuccin_status_background "#11111b"
+      '';
    };

    programs.tmux = {
@ -42,7 +42,8 @@ in {
        set-window-option -g pane-base-index 1
        set-option -g renumber-windows on

-        set -g default-terminal "tmux-256color"
+        set -g default-terminal "$TERM"
+        set -ag terminal-overrides ",$TERM:Tc"
        set -g allow-passthrough on

        set -g status-right-length 100
--- a/modules/home/apps/web/librewolf/default.nix
+++ b/modules/home/apps/web/librewolf/default.nix
@ -61,7 +61,7 @@ in {
                }
              ];

-              iconUpdateURL = "https://www.openstreetmap.org/favicon.ico";
+              icon = "https://www.openstreetmap.org/favicon.ico";
              definedAliases = ["@openstreetmap" "@osm"];
            };

@ -72,7 +72,7 @@ in {
                }
              ];

-              iconUpdateURL = "https://search.zoeys.computer/searx/static/themes/simple/img/favicon.svg";
+              icon = "https://search.zoeys.computer/searx/static/themes/simple/img/favicon.svg";
              definedAliases = ["@searx"];
            };

@ -83,7 +83,7 @@ in {
                }
              ];

-              iconUpdateURL = "https://docs.rs/-/static/favicon.ico";
+              icon = "https://docs.rs/-/static/favicon.ico";
              definedAliases = ["@docs"];
            };

@ -94,7 +94,7 @@ in {
                }
              ];

-              iconUpdateURL = "https://crates.io/assets/cargo.png";
+              icon = "https://crates.io/assets/cargo.png";
              definedAliases = ["@crates"];
            };
          };
--- a/modules/home/apps/web/zen/default.nix
+++ b/modules/home/apps/web/zen/default.nix
@ -0,0 +1,24 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.apps.web.zen;
+in {
+  options.apps.web.zen = with types; {
+    enable = mkBoolOpt false "Enable or disable zen";
+
+    setDefault = mkBoolOpt false "Set zen as default browser";
+  };
+
+  config = mkIf cfg.enable {
+    xdg.mimeApps.defaultApplications = mkIf cfg.setDefault {
+      "text/html" = "zen-beta.desktop";
+      "x-scheme-handler/http" = "zen-beta.desktop";
+      "x-scheme-handler/https" = "zen-beta.desktop";
+    };
+  };
+}