Font and cursor

16 files changed, 82 insertions, 83 deletions

diff --git a/common/modules/matugen/templates/matugen-discord.nix b/common/modules/matugen/templates/matugen-discord.nix
index d3e72a5..ceff9b6 100644
--- a/common/modules/matugen/templates/matugen-discord.nix
+++ b/common/modules/matugen/templates/matugen-discord.nix
@@ -26,8 +26,8 @@
 
               body {
                   /* font options */
-                  --font: "IosevkaInput"; 
-                  --code-font: "IosevkaInput"; 
+                  --font: "monospace"; 
+                  --code-font: "monospace"; 
                   font-weight: 300; 
                   letter-spacing: -0.05ch; 
 
@@ -201,7 +201,7 @@
               /* customize things here */
               :root {
               	/* font, change to 'gg sans' for default discord font*/
-              	--font: 'IosevkaInput';
+              	--font: 'monospace';
 
               	/* top left corner text */
               	--corner-text: 'Midnight';
diff --git a/common/modules/matugen/templates/matugen-waybar.nix b/common/modules/matugen/templates/matugen-waybar.nix
index a59cac9..2958c0e 100644
--- a/common/modules/matugen/templates/matugen-waybar.nix
+++ b/common/modules/matugen/templates/matugen-waybar.nix
@@ -260,7 +260,7 @@
             color: @fg;
             border: none;
             padding: 0px;
-            font-family: "IosevkaInput";
+            font-family: "monospace";
             transition: background-color .3s ease-out;
             font-weight: bold;
             font-size: 12px;
diff --git a/common/modules/terminal/foot.nix b/common/modules/terminal/foot.nix
index 7603776..3317bf0 100644
--- a/common/modules/terminal/foot.nix
+++ b/common/modules/terminal/foot.nix
@@ -26,7 +26,7 @@ in
           horizontal-letter-offset = 0;
           underline-offset = 2;
 
-          pad = "${toString cfg.window.padding-x}x${toString cfg.window.padding-y} center";
+          pad = "${toString cfg.window.padding-x}x${toString cfg.window.padding-y}";
           font = "${cfg.font.family}:size=${toString cfg.font.size}";
 
           dpi-aware = "no";
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index fa18ae6..4ca4384 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -33,9 +33,9 @@ in
         shell-integration-features = "no-cursor";
 
         adjust-underline-position = "7%";
-        adjust-cell-width = "";
-        adjust-cell-height = "";
-        adjust-font-baseline = "";
+        # adjust-cell-width = "";
+        # adjust-cell-height = "";
+        # adjust-font-baseline = "";
         gtk-titlebar = false;
         gtk-single-instance = true;
         gtk-tabs-location = "bottom";
diff --git a/common/modules/window_managers/niri/default.nix b/common/modules/window_managers/niri/default.nix
index ac2d99e..4548839 100644
--- a/common/modules/window_managers/niri/default.nix
+++ b/common/modules/window_managers/niri/default.nix
@@ -47,11 +47,21 @@ in
                   // scroll-method "two-finger"
                   // disabled-on-external-mouse
               }
+              mouse {
+                  scroll-method "on-button-down"
+                  scroll-button 274 // "middle" is also accepted
+                  
+                  scroll-button-lock
+              }
 
               warp-mouse-to-focus
               focus-follows-mouse max-scroll-amount="0%"
           }
 
+          clipboard {
+              disable-primary
+          }
+
           output "eDP-1" {
               mode "1920x1080@120.030"
               scale 1
@@ -253,7 +263,7 @@ in
               ''}
 
               Mod+E hotkey-overlay-title="Open wallpaper picker" { spawn-sh "nautilus"; }
-              Mod+B hotkey-overlay-title="Open wallpaper picker" { spawn-sh "librewolf"; }
+              Mod+B hotkey-overlay-title="Open wallpaper picker" { spawn-sh "brave-origin"; }
               Mod+Shift+C hotkey-overlay-title="Get current dat and time as noticiation" { spawn-sh "fyi Clock $(date)"; }
               XF86AudioPlay        allow-when-locked=true { spawn-sh "playerctl play-pause"; }
               XF86AudioStop        allow-when-locked=true { spawn-sh "playerctl stop"; }
diff --git a/common/programs/bash.nix b/common/programs/bash.nix
index 1ad9e80..f6987ed 100644
--- a/common/programs/bash.nix
+++ b/common/programs/bash.nix
@@ -1,6 +1,6 @@
 {
   programs.bash = {
-    enable = true;
+    enable = false;
     historySize = 10000;
     historyFile = "$HOME/.bash_history";
     historyControl = [
diff --git a/common/programs/brave.nix b/common/programs/brave.nix
index cba3bca..d7240e7 100644
--- a/common/programs/brave.nix
+++ b/common/programs/brave.nix
@@ -1,7 +1,7 @@
 { inputs, pkgs, ... }:
 {
   programs.brave = {
-    enable = false;
+    enable = true;
     package = inputs.brave-origin.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
     extensions = [
diff --git a/common/programs/dunst.nix b/common/programs/dunst.nix
index 78aadf5..b96d274 100644
--- a/common/programs/dunst.nix
+++ b/common/programs/dunst.nix
@@ -15,7 +15,7 @@ in
       enable = true;
       settings = {
         global = {
-          font = "IosevkaInput 11";
+          font = "monospace 11";
           corner_radius = 0;
           frame_width = 2;
           markup = "yes";
diff --git a/common/programs/fish.nix b/common/programs/fish.nix
index 9d979a2..8d9be78 100644
--- a/common/programs/fish.nix
+++ b/common/programs/fish.nix
@@ -3,23 +3,20 @@
   ...
 }:
 {
-  programs.fish.enable = false;
-
-  home.packages = with pkgs; [
-    fzf
-  ];
+  # home.packages = with pkgs; [
+  #   fzf
+  # ];
 
   programs.fish = {
+    enable = true;
     interactiveShellInit =
       #fish
       ''
         function fish_mode_prompt
         end
         set -g fish_greeting ""
+        set -U fish_autosuggestion_enabled 0
         fish_vi_key_bindings
-        set -U fish_color_user blue
-        set -U fish_color_host normal
-        set -U fish_color_cwd blue
       '';
   };
 }
diff --git a/common/programs/librewolf.nix b/common/programs/librewolf.nix
index d5bdea4..9238632 100644
--- a/common/programs/librewolf.nix
+++ b/common/programs/librewolf.nix
@@ -7,7 +7,7 @@
 }:
 {
   programs.librewolf = {
-    enable = true;
+    enable = false;
     policies = {
       ExtensionSettings = {
         # "uBlock0@raymondhill.net" = {
@@ -66,7 +66,7 @@
       userChrome = ''
         @import "firefox-gnome-theme/userChrome.css";
         * {
-          font-family: "IosevkaInput" !important;
+          font-family: "monospace" !important;
           border-radius: 0px !important;
         }
 
@@ -74,7 +74,7 @@
       userContent = ''
         @import "firefox-gnome-theme/userContent.css";
         * {
-          font-family: "IosevkaInput" !important;
+          font-family: "monospace" !important;
           border-radius: 0px !important;
         }
       '';
diff --git a/common/programs/rofi.nix b/common/programs/rofi.nix
index 20fdffe..73e31f9 100644
--- a/common/programs/rofi.nix
+++ b/common/programs/rofi.nix
@@ -8,7 +8,7 @@
   config = lib.mkIf config.beeMods.windowManagers.beeConfig.enable {
     programs.rofi = {
       enable = true;
-      font = "IosevkaInput";
+      font = "monospace";
       # plugins = with pkgs; [ rofi-emoji ];
       theme = "~/.config/rofi/themes/config.rasi";
       extraConfig = {
@@ -84,7 +84,7 @@
                 placeholder-color: @fg-dim;
                 placeholder:       "Search...";
                 cursor:            text;
-                font:              "IosevkaInput 13";
+                font:              "monospace 13";
             }
 
             listview {
@@ -136,7 +136,7 @@
                 background-color: transparent;
                 text-color:       inherit;
                 vertical-align:   0.5;
-                font:             "IosevkaInput 13";
+                font:             "monospace 13";
             }
           '';
       };
diff --git a/flake.lock b/flake.lock
index cb4933b..f3641cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1781624075,
-        "narHash": "sha256-P9pHDrzACC8Ub/vRuLSU+kd1eTpx2vYUUYZgpqzK8xQ=",
+        "lastModified": 1781900166,
+        "narHash": "sha256-ievNKEfsW+qJClgWqHK2IZNzBgImXCSbM6LfaeBDRgI=",
         "ref": "refs/heads/main",
-        "rev": "212669d7a129517b839b6ebd57d9a4a1c5a6093b",
-        "revCount": 38,
+        "rev": "c936db0627f277852fa69a9f5ed1d561c4512394",
+        "revCount": 41,
         "type": "git",
         "url": "https://codeberg.org/beeb5k/beeVim"
       },
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781557312,
-        "narHash": "sha256-QOIRYSUFSq7L5mY3dZymaVhcnne3tPgoR9riB0WocjA=",
+        "lastModified": 1781667738,
+        "narHash": "sha256-OxrwHpsWf+QGbos1LMDGAcv7sjBGshcw/43th6waeYI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c03e4752899e55705dfa63979abd885c582a5c48",
+        "rev": "7664e05e2413d5e2b8c54a884eb8ea0f8a504fc2",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1781591878,
-        "narHash": "sha256-WfQNALT+8ZbjZG2co1tz2dZZZw1tcU5ynuFe+vVMbV0=",
+        "lastModified": 1781657058,
+        "narHash": "sha256-MPMEBoawVAZ1fEuctPBVUQ3Fcs2c3avwojrkR0ZjVA4=",
         "owner": "mangowm",
         "repo": "mango",
-        "rev": "24fb167ae6ffc0272b2feb0c293b3c8a9a2125ae",
+        "rev": "5652066c6891b5264bce1557a1e956240a771932",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781581126,
-        "narHash": "sha256-GXzO08gNKZsEuVgMhIfuUvc5G4Xh1rNot8KWjZsKNos=",
+        "lastModified": 1781666546,
+        "narHash": "sha256-9mstXbgi7/FepdoaTB8QqbaME7sdELMdGLGOQHCrVlA=",
         "owner": "noctalia-dev",
         "repo": "noctalia",
-        "rev": "de82488dc60db736acd5bf95fb448405ea99f404",
+        "rev": "6b0e16179645e15693efd94f51109d22b199418c",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "plugins-lze": {
       "flake": false,
       "locked": {
-        "lastModified": 1780516349,
-        "narHash": "sha256-AMOXr1DqbnPXbEdkSMnOOr2mpfo6rZbg2vw2A1zFoII=",
+        "lastModified": 1781615349,
+        "narHash": "sha256-vc4nNSOVecUA2ZD2TKN48ffGLpOz5alNt11LlfqYOrI=",
         "owner": "BirdeeHub",
         "repo": "lze",
-        "rev": "177bba953cf422e4b8e4fa6f9b0a603b135e169e",
+        "rev": "bb97115ec6dad1872d5005f7ef6c0e05cf5132e9",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "plugins-lzextras": {
       "flake": false,
       "locked": {
-        "lastModified": 1780516431,
-        "narHash": "sha256-aPZFLIF5RpE584X4RaJkRpah5bNi3yRrF3dzy1/PTW0=",
+        "lastModified": 1781615385,
+        "narHash": "sha256-Q+av9YqiF4PzgvsMngIrdoYRaZXnMvP1YDzGD78DUGM=",
         "owner": "BirdeeHub",
         "repo": "lzextras",
-        "rev": "780f189a44a8d6ee4027146488f83315addb7262",
+        "rev": "5f6bc3682e19b4c5e12e5a5215bc3fade9f29876",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
     "plugins-neogit": {
       "flake": false,
       "locked": {
-        "lastModified": 1778668243,
-        "narHash": "sha256-ZKK4JbeuMGYvUjG1B6vLZTeSMeQTXQGFQAlIMqqN660=",
+        "lastModified": 1781509219,
+        "narHash": "sha256-K7AtBKS2b77pjfdxb11A7U7ED+XTjn4W8ajk//8U7TA=",
         "owner": "NeogitOrg",
         "repo": "neogit",
-        "rev": "99326a1310fb2d616b455d2fd16d01bf00682f06",
+        "rev": "5d1b65d6215928e941e1a6a4e76e02fd45ada31f",
         "type": "github"
       },
       "original": {
diff --git a/hosts/common.nix b/hosts/common.nix
index 36799fc..54678fe 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -23,7 +23,7 @@
 
   programs.nh = {
     enable = true;
-    clean.enable = true;
+    clean.enable = false;
     clean.extraArgs = "--keep-since 4d --keep 2";
     flake = "/home/${user}/.config/beeSystems";
   };
@@ -140,12 +140,12 @@
         "2620:fe::9#dns.quad9.net"
 
         # Cloudflare IPv4
-        "1.1.1.1#cloudflare-dns.com"
-        "1.0.0.1#cloudflare-dns.com"
+        # "1.1.1.1#cloudflare-dns.com"
+        # "1.0.0.1#cloudflare-dns.com"
 
         # Cloudflare IPv6
-        "2606:4700:4700::1111#cloudflare-dns.com"
-        "2606:4700:4700::1001#cloudflare-dns.com"
+        # "2606:4700:4700::1111#cloudflare-dns.com"
+        # "2606:4700:4700::1001#cloudflare-dns.com"
       ];
     };
   };
@@ -179,31 +179,18 @@
   security.rtkit.enable = true;
   security.polkit.enable = true;
 
-  # fonts.fontconfig = {
-  #   enable = true;
-  #   antialias = true;
-  #   hinting = {
-  #     enable = true;
-  #     style = "slight";
-  #   };
-  #   subpixel = {
-  #     rgba = "rgb";
-  #     lcdfilter = "default";
-  #   };
-  # };
-
   fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
-    inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.iosevka-input
-    nerd-fonts.symbols-only
+    nerd-fonts.iosevka
+    # inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.iosevka-input
+    # nerd-fonts.symbols-only
     noto-fonts
     noto-fonts-cjk-sans-static
-    # nerd-fonts.jetbrains-mono
   ];
 
   fonts.fontconfig.defaultFonts.monospace = [
+    "Iosevka Nerd Font"
     "IosevkaInput"
-    # "JetBrainsMono Nerd Font"
     "Symbols Nerd Font"
   ];
 
@@ -211,7 +198,7 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-gnome3;
+    pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
   };
 
   sops = {
@@ -260,6 +247,8 @@
   services.gvfs.enable = true;
   services.udisks2.enable = true;
 
+  programs.fish.enable = true;
+
   environment.systemPackages = with pkgs; [
     android-tools
     playerctl
diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix
index 796dc17..6c16a13 100644
--- a/hosts/niuwux/default.nix
+++ b/hosts/niuwux/default.nix
@@ -86,7 +86,7 @@
 
   users.users.${user} = {
     isNormalUser = true;
-    shell = pkgs.bash;
+    shell = pkgs.fish;
     extraGroups = [
       "networkmanager"
       "wheel"
diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix
index 04f9e6d..95572f1 100644
--- a/users/beeb5k/default.nix
+++ b/users/beeb5k/default.nix
@@ -28,9 +28,10 @@
         window = {
           blur.enable = true;
           blur.passes = 1;
-          blur.radius = 8;
-          opacity = 0.93;
+          blur.radius = 6;
+          opacity = 0.95;
           borderRadius = 0;
+          shadows.enable = true;
         };
       };
       beeConfig.enable = false;
@@ -40,8 +41,8 @@
     terminal = {
       default = "ghostty";
       ghostty = true;
-      font.family = "IosevkaInput";
-      font.size = 11.0;
+      font.family = "monospace";
+      font.size = 12.0;
     };
   };
 
diff --git a/users/common.nix b/users/common.nix
index 4affeca..c7f23bf 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -57,8 +57,8 @@ in
     dotIcons.enable = true;
     hyprcursor.size = 24;
     hyprcursor.enable = true;
-    name = "miku-cursor";
-    package = mikuCursor;
+    name = "Bibata-Modern-Ice";
+    package = pkgs.bibata-cursors;
   };
 
   dconf.settings = {
@@ -77,7 +77,8 @@ in
 
   gtk = {
     enable = true;
-    font.name = "IosevkaInput";
+    font.name = "monospace";
+    font.size = 12.0;
     theme = {
       package = pkgs.adw-gtk3;
       name = "adw-gtk3";
@@ -147,7 +148,7 @@ in
       hwdec = "auto";
       profile = "high-quality";
       save-position-on-quit = "yes";
-      sub-font = "IosevkaInput";
+      sub-font = "monospace";
       sub-font-size = 25;
       sub-shadow-offset = 0;
       sub-border-size = 1;
@@ -161,5 +162,6 @@ in
     imagemagick
     nautilus
     opencode
+    clang
   ];
 }