Font and cursor

11 files changed, 33 insertions, 26 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";
             }
           '';
       };