idk a lot

11 files changed, 258 insertions, 53 deletions

diff --git a/common/modules/beevim/default.nix b/common/modules/beevim/default.nix
index 49b66c4..0c80caf 100644
--- a/common/modules/beevim/default.nix
+++ b/common/modules/beevim/default.nix
@@ -30,9 +30,9 @@ in
           n: _:
           { pkgs, ... }:
           {
-            settings = {
-              neovim-unwrapped = pkgs.neovim-unwrapped;
-            };
+            # settings = {
+            #   neovim-unwrapped = pkgs.neovim-unwrapped;
+            # };
             categories = {
               clang = false;
               markdown = false;
diff --git a/common/modules/mango/waybar.nix b/common/modules/mango/waybar.nix
index c6ec509..0ee4a83 100644
--- a/common/modules/mango/waybar.nix
+++ b/common/modules/mango/waybar.nix
@@ -300,7 +300,12 @@ in
         border-width: 2px;
         border-style: solid;
         border-color: @border_color;
+      }
+
+      tooltip label {
         color: @text_main;
+        font-weight: 500;
+        text-shadow: none;
       }
 
       #window,
diff --git a/common/modules/terminal/default.nix b/common/modules/terminal/default.nix
index 8561025..3bc4a56 100644
--- a/common/modules/terminal/default.nix
+++ b/common/modules/terminal/default.nix
@@ -37,7 +37,6 @@ with lib;
         type = types.str;
         default = "monospace";
       };
-
       size = mkOption {
         type = types.float;
         default = 13.0;
diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index b827ca8..0dfe0f7 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -2,5 +2,6 @@
 {
   flake.overlays = {
     ioskeleyMono = import ./ioskeleyMono.nix;
+    iosevkaInput = import ./ioskeleyInput.nix;
   };
 }
diff --git a/common/overlays/ioskeleyInput.nix b/common/overlays/ioskeleyInput.nix
new file mode 100644
index 0000000..b9e1145
--- /dev/null
+++ b/common/overlays/ioskeleyInput.nix
@@ -0,0 +1,195 @@
+final: prev: {
+  ioskeley-input = prev.iosevka.override {
+    set = "IosevkaInput";
+    privateBuildPlan = {
+      family = "IosevkaInput";
+      spacing = "fixed";
+      serifs = "sans";
+      noLigation = true;
+      exportGlyphNames = false;
+
+      variants.design = {
+        one = "base";
+        two = "curly-neck-serifless";
+        three = "flat-top-serifless";
+        four = "closed-serifless";
+        five = "upright-flat-serifless";
+        six = "closed-contour";
+        seven = "straight-serifless";
+        eight = "two-circles";
+        nine = "closed-contour";
+        zero = "oval-long-dotted";
+        capital-a = "straight-serifless";
+        capital-b = "standard-serifless";
+        capital-c = "bilateral-inward-serifed";
+        capital-d = "standard-serifless";
+        capital-e = "serifless";
+        capital-f = "serifless";
+        capital-g = "toothless-corner-serifless-hooked";
+        capital-h = "serifless";
+        capital-i = "serifed";
+        capital-j = "serifless";
+        capital-k = "symmetric-connected-serifless";
+        capital-l = "serifless";
+        capital-m = "hanging-serifless";
+        capital-n = "standard-serifless";
+        capital-p = "closed-serifless";
+        capital-q = "crossing-curly-tailed";
+        capital-r = "straight-serifless";
+        capital-s = "bilateral-inward-serifed";
+        capital-t = "serifless";
+        capital-u = "toothless-rounded-serifless";
+        capital-v = "curly-serifless";
+        capital-w = "straight-vertical-sides-serifless";
+        capital-x = "curly-serifless";
+        capital-y = "curly-serifless";
+        capital-z = "straight-serifed";
+        a = "double-storey-toothless-corner";
+        b = "toothless-corner-serifless";
+        c = "serifless";
+        d = "toothless-corner-serifless";
+        e = "flat-crossbar";
+        f = "flat-hook-serifless-crossbar-at-x-height";
+        g = "double-storey";
+        h = "straight-serifless";
+        i = "zshaped";
+        j = "flat-hook-serifed";
+        k = "straight-serifless";
+        l = "zshaped";
+        m = "earless-rounded-double-arch-short-leg-serifless";
+        n = "earless-corner-straight-serifless";
+        p = "earless-corner-serifless";
+        q = "earless-corner-straight-serifless";
+        r = "earless-corner-serifless";
+        s = "serifless";
+        t = "flat-hook";
+        u = "toothless-corner-serifless";
+        v = "straight-serifless";
+        w = "rounded-vertical-sides-serifless";
+        x = "straight-serifless";
+        y = "straight-turn-serifless";
+        z = "straight-serifless";
+        capital-eszet = "corner-serifless";
+        long-s = "bent-hook-serifless";
+        eszet = "sulzbacher-serifless";
+        lower-eth = "straight-bar";
+        capital-thorn = "serifless";
+        lower-thorn = "serifless";
+        lower-alpha = "crossing";
+        lower-beta = "standard";
+        capital-gamma = "serifless";
+        lower-gamma = "casual";
+        capital-delta = "straight";
+        lower-delta = "flat-top";
+        lower-eta = "earless-corner-serifless";
+        lower-theta = "capsule";
+        lower-iota = "serifed-semi-tailed";
+        lower-kappa = "straight-serifless";
+        capital-lambda = "straight-serifless";
+        lower-lambda = "straight";
+        lower-mu = "toothless-corner-serifless";
+        lower-nu = "casual";
+        lower-xi = "flat-top";
+        lower-pi = "tailless";
+        lower-tau = "semi-tailed";
+        lower-upsilon = "casual-serifless";
+        lower-phi = "cursive";
+        lower-chi = "semi-chancery-straight-serifless";
+        lower-psi = "flat-top-serifless";
+        partial-derivative = "straight-bar";
+        cyrl-a = "single-storey-earless-corner-tailed";
+        cyrl-ve = "standard-serifless";
+        cyrl-capital-zhe = "symmetric-connected";
+        cyrl-zhe = "symmetric-connected";
+        cyrl-capital-ze = "bilateral-inward-serifed";
+        cyrl-ze = "serifless";
+        cyrl-capital-ka = "symmetric-connected-bottom-right-serifed";
+        cyrl-ka = "symmetric-connected-serifless";
+        cyrl-el = "straight";
+        cyrl-em = "flat-bottom-serifless";
+        cyrl-capital-en = "serifed";
+        cyrl-en = "serifless";
+        cyrl-capital-er = "closed-serifed";
+        cyrl-er = "eared-serifed";
+        cyrl-capital-u = "cursive-serifless";
+        cyrl-u = "cursive-serifless";
+        cyrl-ef = "serifless";
+        cyrl-che = "standard";
+        cyrl-yeri = "corner";
+        cyrl-yery = "corner";
+        cyrl-capital-e = "bilateral-inward-serifed";
+        cyrl-e = "serifless";
+        cyrl-capital-ya = "standing-serifless";
+        cyrl-ya = "standing-serifless";
+        tittle = "round";
+        diacritic-dot = "round";
+        punctuation-dot = "round";
+        braille-dot = "square";
+        tilde = "low";
+        asterisk = "hex-low";
+        underscore = "above-baseline";
+        caret = "medium";
+        ascii-grave = "straight";
+        ascii-single-quote = "straight";
+        paren = "normal";
+        brace = "curly-flat-boundary";
+        guillemet = "straight";
+        number-sign = "upright";
+        ampersand = "closed";
+        at = "fourfold";
+        dollar = "through";
+        cent = "through";
+        percent = "rings-continuous-slash";
+        bar = "force-upright";
+        question = "corner";
+        pilcrow = "high";
+        micro-sign = "tailed-serifless";
+        decorative-angle-brackets = "middle";
+      };
+
+      weights = {
+        W360 = {
+          shape = 360;
+          menu = 360;
+          css = 360;
+        };
+        Heavy = {
+          shape = 900;
+          menu = 900;
+          css = 900;
+        };
+      };
+
+      slopes = {
+        Upright = {
+          angle = 0;
+          shape = "upright";
+          menu = "upright";
+          css = "normal";
+        };
+        Oblique = {
+          angle = 15;
+          shape = "oblique";
+          menu = "oblique";
+          css = "oblique";
+        };
+      };
+
+      widths.Normal = {
+        shape = 575;
+        menu = 5;
+        css = "normal";
+      };
+
+      metricOverride = {
+        leading = 1100;
+        parenSize = 950;
+        cap = 800;
+        ascender = 800;
+        xHeight = 600;
+        dotSize = "blend(weight, [100, 50], [360, 140], [900, 190])";
+        periodSize = "blend(weight, [100, 55], [360, 160], [900, 215])";
+      };
+    };
+  };
+}
diff --git a/common/programs/zenBrowser.nix b/common/programs/zenBrowser.nix
index 9fe22a9..8227bc7 100644
--- a/common/programs/zenBrowser.nix
+++ b/common/programs/zenBrowser.nix
@@ -75,8 +75,8 @@ in
           ExtensionSettings = builtins.listToAttrs extensions;
 
           SearchEngines = {
-            # Default = "DuckDuckGo";
-            Default = "Omnisearch";
+            Default = "DuckDuckGo";
+            # Default = "Omnisearch";
             PreventInstalls = true;
             Remove = [
               "Google"
diff --git a/flake.lock b/flake.lock
index 547251e..52d0d0f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,15 +3,17 @@
     "beaker-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773829265,
-        "narHash": "sha256-K97/aeTrR5oGnIKdRhcC2xhqBDoVLDg4Eh4u/qZFGqE=",
+        "lastModified": 1773884524,
+        "narHash": "sha256-1dnlofWaxI/YRID+WPz2jHZNDyloBubDt/bAQk9ePLU=",
         "ref": "refs/heads/master",
-        "rev": "38aa54bb91597bd15ecd1dca1da6194c80249039",
-        "revCount": 20,
+        "rev": "abc598baf15d6f8a4de395a27ba34b1e769558e1",
+        "revCount": 21,
+        "shallow": false,
         "type": "git",
         "url": "https://git.bwaaa.monster/beaker"
       },
       "original": {
+        "shallow": false,
         "type": "git",
         "url": "https://git.bwaaa.monster/beaker"
       }
@@ -31,11 +33,11 @@
         "plugins-rustaceanvim": "plugins-rustaceanvim"
       },
       "locked": {
-        "lastModified": 1773942883,
-        "narHash": "sha256-S+/z/zAhXqw/sw5cOIRGeZb5vcpBT/MGxL69+iviheQ=",
+        "lastModified": 1774085729,
+        "narHash": "sha256-Y89SRySAatz6SUL6lY0P1s+Mh2reZFFEIcsK6pwnjpE=",
         "ref": "refs/heads/main",
-        "rev": "b986c836a8e4c8504bf676d2825d55d923576712",
-        "revCount": 10,
+        "rev": "eebd250aef9b71dfe2a8a6b6893a5ba029c4b8b9",
+        "revCount": 13,
         "type": "git",
         "url": "https://codeberg.org/brustybee/beeVim"
       },
@@ -246,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773935367,
-        "narHash": "sha256-+RjULqqbCYmOJG+99pNqEGRJV7bX8DYPbxKUhKWFKsI=",
+        "lastModified": 1774007980,
+        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a7ec5440474cdcc9939cc67c320f01aea0a2f195",
+        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
         "type": "github"
       },
       "original": {
@@ -284,11 +286,11 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1773910968,
-        "narHash": "sha256-X0Qw5RSRXgkM+dtbhLyPYFNRj+RELdJJT+SZsoB0TtM=",
+        "lastModified": 1774017789,
+        "narHash": "sha256-W+QFFXaPz5H/rGcqj7iFrYqXazZGNyCLzJivxUIpyqA=",
         "owner": "mangowm",
         "repo": "mango",
-        "rev": "deb47e8ab957550e376c3fb0dfb2c6aeab1ce9fd",
+        "rev": "ccefa572e1cd221bb3d8b4edc44bf6c91f5be6f6",
         "type": "github"
       },
       "original": {
@@ -304,11 +306,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773929940,
-        "narHash": "sha256-/GsSVKRuBfH4xJNvaLo8jrph/YXE4GefVVT8yVaV7M0=",
+        "lastModified": 1773988994,
+        "narHash": "sha256-B89dboqh+sv8mHyxALtQia9/pEQpwI62BZG+F3oZ9C0=",
         "ref": "refs/heads/main",
-        "rev": "d0674f93f12b54975ce307a647e08d1c59fa3d79",
-        "revCount": 7,
+        "rev": "8a12dea75168890059315da02eb9bd9680936ac9",
+        "revCount": 8,
         "type": "git",
         "url": "https://codeberg.org/brustybee/mydwm"
       },
@@ -324,11 +326,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1773878753,
-        "narHash": "sha256-yfJ3Vj0kqvJ+F5E1QtGfYgCFDncEe2vmYcDK+ofUrmQ=",
+        "lastModified": 1774051512,
+        "narHash": "sha256-6IlLcSU4DJx6N+iIkorPa5/IGQ/sJLoVWQcqlsxWM98=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "14408dc1b61b6112a79d4b2e5e10e658e18bd554",
+        "rev": "1db9d29916c326e55f2e7435a7692b5695090b81",
         "type": "github"
       },
       "original": {
@@ -360,11 +362,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773878059,
-        "narHash": "sha256-2AygdMsagzsmMZfmayQ8Zr8M/Ac8lGiCm+eXL2/+TKw=",
+        "lastModified": 1774050147,
+        "narHash": "sha256-wgd3Jglqc1XSxWyXIHMs0eSmDM5ib+bHpxtlcYG7CT8=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "19715e6e8a7145c8d4da39c9ebc2b09da5be74e7",
+        "rev": "3c90cc1234ac66806b7da1e2fd9b0880c959521e",
         "type": "github"
       },
       "original": {
@@ -521,11 +523,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773925917,
-        "narHash": "sha256-NYibcf8fYNIvpOQ/YYkrXzk9b6GuCWqmC3cQEb275Y8=",
+        "lastModified": 1774107556,
+        "narHash": "sha256-NFxBKTEf4SaWNV6HGOVSeR+kjDLVdM4PMeDTxVD5emk=",
         "ref": "refs/heads/master",
-        "rev": "c64913b13728cb4f95e0b640778945c76fcda7c0",
-        "revCount": 58,
+        "rev": "8229aaa489c8e9cda0ce1ce0997006df712f5123",
+        "revCount": 64,
         "type": "git",
         "url": "https://git.bwaaa.monster/omnisearch"
       },
diff --git a/flake.nix b/flake.nix
index 494bf4e..3540d1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,10 +20,10 @@
       url = "github:mangowm/mango";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    omnisearch = {
-      url = "git+https://git.bwaaa.monster/omnisearch";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # omnisearch = {
+    #   url = "git+https://git.bwaaa.monster/omnisearch";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/common.nix b/hosts/common.nix
index b92e9ec..a595379 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -185,9 +185,10 @@
   fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
     # ioskeley-mono
+    ioskeley-input
     # maple-mono.NF
-    nerd-fonts.symbols-only
     nerd-fonts.jetbrains-mono
+    nerd-fonts.sauce-code-pro
   ];
   fonts.fontconfig.defaultFonts.monospace = [
     "JetBrainsMono Nerd Font"
diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix
index 7fd1f56..7faa715 100644
--- a/hosts/nixios/default.nix
+++ b/hosts/nixios/default.nix
@@ -15,7 +15,7 @@
     ./hardware-configuration.nix
     (import ../common.nix { inherit user; })
     beeMods
-    inputs.omnisearch.nixosModules.default
+    # inputs.omnisearch.nixosModules.default
   ];
 
   services.logind = {
@@ -26,15 +26,15 @@
     };
   };
 
-  services.omnisearch = {
-    enable = true;
-    settings = {
-      server = {
-        port = 8087;
-        domain = "https://search.bee.me";
-      };
-    };
-  };
+  # services.omnisearch = {
+  #   enable = true;
+  #   settings = {
+  #     server = {
+  #       port = 8087;
+  #       domain = "https://search.bee.me";
+  #     };
+  #   };
+  # };
 
   # REMOVE LATER
   virtualisation.vmVariant = {
@@ -80,7 +80,7 @@
   programs.gamemode.enable = config.programs.steam.enable;
   programs.gamescope = {
     enable = config.programs.steam.enable;
-    capSysNice = true;
+    # capSysNice = true;
   };
   programs.steam = {
     enable = true;
diff --git a/users/bee/default.nix b/users/bee/default.nix
index 72a6ed9..eedde86 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -23,15 +23,16 @@
       waybar = true;
       window = {
         blur.enable = true;
-        blur.radius = 10;
+        blur.radius = 7;
         blur.passes = 2;
+        opacity = 0.82;
         shadows = true;
       };
     };
     dwm = {
       enable = true;
       picom = {
-        enable = false;
+        enable = true;
         window = {
           blur.enable = true;
           blur.strength = 6;
@@ -43,7 +44,8 @@
     matugen.enable = true;
     terminal = {
       foot = true;
-      font.family = "JetBrainsMono Nerd Font Mono";
+      # font.family = "JetBrainsMono Nerd Font Mono";
+      font.family = "IosevkaInput";
     };
   };