up

modules/cava/default.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}:
+
+{
+  programs.cava.enable = true;
+}

modules/fish/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  programs.fish.enable = true;
+  home.shell.enableFishIntegration = true;
+  programs.fish.functions = {
+    fish_greeting = "";
+  };
+}

modules/fuzzel/default.nix

@@ -0,0 +1,39 @@
+{pkgs, lib, config,...}:
+{
+  programs.fuzzel.enable = true;
+  programs.fuzzel.settings = lib.mkAfter {
+    main = {
+      dpi-aware = false;
+      font = lib.mkForce "JetBrainsMono NF SemiBold:size=14";
+      placeholder = " Search...";
+      icons-enabled = true;
+      use-bold = true;
+      fields = lib.mkForce "name,generic,comment,categories,filename,keywords,exec";
+      terminal = "kitty";
+      prompt = "";
+      show-actions = false;
+      anchor = "center";
+      x-margin = 15;
+      y-margin = 0;
+      lines = 10;
+      width = 50;
+      horizontal-pad = 20;
+      vertical-pad = 20;
+      inner-pad = 5;
+      line-height = 30;
+      letter-spacing = 0;
+      image-size-ratio = 0.2;
+      exit-on-keyboard-focus-loss = true;
+    };
+    border = {
+      radius = 5;
+			width = 2;
+    };
+    dmenu = {
+      mode = "text";
+    };
+    colors = {
+      prompt = lib.mkForce "${config.lib.stylix.colors.base00-hex}ff";
+    };
+  };
+}

modules/hypr/default.nix

@@ -1,6 +1,10 @@
 {pkgs, ...}:
 
 {
+  services.hyprpolkitagent.enable = true;
+	wayland.windowManager.hyprland.enable = true;
+	wayland.windowManager.hyprland.package = null;
+	wayland.windowManager.hyprland.portalPackage = null;
   wayland.windowManager.hyprland.extraConfig = ''
   autogenerated = 0 # remove this line to remove the warning
 
@@ -14,7 +18,7 @@ monitor = DP-1, highres@highrr, 0x0, 1
 exec-once = hyprctl dispatch workspace 1
 #exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
 exec-once = hyprlock
-exec-once = ashell
+exec-once = waybar
 exec-once = pw-metadata -n settings 0 clock.force-quantum 2048
 # exec-once = ashell
 exec-once = systemctl --user start hyprpolkitagent
@@ -27,9 +31,10 @@ exec-once = sunshine
 debug:full_cm_proto=true
 
 # Set programs that you use
-$terminal = kitty
+$terminal = kitty nu
 $fileManager = thunar 
-$menu = rofi -show drun
+$menu = fuzzel
+$bar = waybar
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -75,7 +80,7 @@ windowrulev2 = immediate, class:^(cs2)$
 decoration {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    rounding = 0
+    rounding = 5
    
     blur {
         enabled = yes
@@ -139,7 +144,7 @@ misc {
 
 # Window Rules
 
-
+windowrule = float, class:^(Wiremix)$
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER

modules/hypr/hyprland_laptop.nix

@@ -1,6 +1,7 @@
 {pkgs, ...}:
 
 {
+  services.hyprpolkitagent.enable
   wayland.windowManager.hyprland.extraConfig = ''
   autogenerated = 0 # remove this line to remove the warning
 
@@ -27,7 +28,7 @@ exec-once = systemctl --user start hyprpolkitagent
 # Set programs that you use
 $terminal = kitty
 $fileManager = thunar 
-$menu = rofi -show drun
+$menu = fuzzel
 
 # Some default env vars.
 env = XCURSOR_SIZE,24

modules/nushell/default.nix

@@ -0,0 +1,16 @@
+{pkgs, config, ...}:
+
+{
+	programs.nushell = {
+		enable = true;
+		extraConfig = ''
+			$env.config.show_banner = false
+		'';
+	};
+	# Fish like Autocomplete
+
+	programs.carapace = {
+		enable = true;
+		enableNushellIntegration = true;
+	};
+}

modules/nvim/config.nix

@@ -0,0 +1,6 @@
+{  
+  programs.nixvim.opts = {
+    shiftwidth = 2;
+    tabstop = 2;
+  };
+}

modules/nvim/default.nix

@@ -1,6 +1,7 @@
 {config, pkgs, lib, inputs, ...}:
 
 {
+  imports = [ ./config.nix ];
   programs.nixvim = {
     enable = true;
     plugins.nvim-tree.enable = true;
@@ -14,7 +15,15 @@
     plugins.web-devicons.enable = true;
     plugins.which-key.enable = true;
     plugins.cmp-nvim-lsp.enable = true;
+    plugins.bufferline.enable = true;
+    plugins.noice.enable = true;
+    plugins.mini-pairs.enable = true;
+    plugins.ts-comments.enable = true;
+    plugins.snacks.enable = true;
+    plugins.mini-icons.enable = true;
+    plugins.nui.enable = true;
     plugins.telescope.enable = true;
     plugins.indent-blankline.enable = true; 
+
   };  
 }

modules/stylix.nix

@@ -20,8 +20,8 @@
   };*/
 
  stylix.image = pkgs.fetchurl {
-    url = "https://w.wallhaven.cc/full/5g/wallhaven-5g22q5.png";
-    hash = "sha256-snqkeQecU0opsBfIrnkl6aiV71hSCmqnZBAsibNG4w8=";
+    url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/schemes/nord/wallhaven-731kr3_3840x2160.png";
+    hash = "sha256-DHEib1bgtOvNp+wo3+L5PiEbKfZkHgR3vhs4YIouKes=";
   };
 
 }

modules/waybar/waybar.nix

@@ -1,120 +1,222 @@
-{pkgs, lib,...}:
+{ pkgs, lib, ... }:
 
 {
   programs.waybar.enable = true;
+
   programs.waybar.settings = [
-{
-  layer = "top";
-  position = "top";
-  #margin = "5, 5, 5, 5";
-  modules-left = [ "hyprland/workspaces"];
-  modules-center = [ "mpris" ];
-  modules-right = [ "cava" "clock" "network" "pulseaudio/slider" "tray" ];
+    {
+      layer    = "top";
+      position = "top";
+      spacing  = 0;
+      height   = 26;
 
-  cava = {
-    bars = 14;
-    bar_delimiter = 0;
-    format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
-  };
+      "modules-left"   = [ "hyprland/workspaces" ];
+      "modules-center" = [ "mpris" ];
+      "modules-right"  = [
+        "group/tray-expander"
+        "cava"
+        "clock"
+        "bluetooth"
+        "network"
+        "pulseaudio"
+        "cpu"
+        "battery"
+      ];
 
-  network = {
-    format = "󱎔";
-    format-disconnected = "";
-    format-wifi = "({signalStrength}%) ";
-  };
+      "hyprland/workspaces" = {
+        "on-click" = "activate";
+        format = "{icon}";
+        "format-icons" = {
+          default = "";
+          active  = "󱓻";
+        };
+      };
 
-  mpris = {
-    format = "{dynamic}";
-    dynamic-order = ["title" "album" "artist" "position" "length"];
-  };
+      cpu = {
+        interval   = 5;
+        format     = "󰍛";
+        "on-click" = "kitty -e btop";
+      };
 
-  tray = {
-    spacing = 2;
-  };
+      clock = {
+        format          = "{:L%A %H:%M}";
+        "format-alt"    = "{:L%d %B W%V %Y}";
+        tooltip         = false;
+        "on-click-right" = "omarchy-launch-floating-terminal-with-presentation omarchy-tz-select";
+      };
 
-  "hyprland/workspaces" = {
-    active-only = false;
-    format = "{icon}";
-    format-icons = {
-      active = "";
-      default = "";
-    };
-  };
+      network = {
+        "format-icons"          = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
+        format                  = "{icon}";
+        "format-wifi"           = "{icon}";
+        "format-ethernet"       = "󰀂";
+        "format-disconnected"   = "󰤮";
+        "tooltip-format-wifi"   = "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}";
+        "tooltip-format-ethernet" = "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}";
+        "tooltip-format-disconnected" = "Disconnected";
+        interval                = 3;
+        spacing                 = 1;
+        "on-click"              = "omarchy-launch-wifi";
+      };
 
-}
+      battery = {
+        format                 = "{capacity}% {icon}";
+        "format-discharging"   = "{icon}";
+        "format-charging"      = "{icon}";
+        "format-plugged"       = "";
+        "format-icons" = {
+          charging = [ "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅" ];
+          default  = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+        };
+        "format-full"          = "󰂅";
+        "tooltip-format-discharging" = "{power:>1.0f}W↓ {capacity}%";
+        "tooltip-format-charging"    = "{power:>1.0f}W↑ {capacity}%";
+        interval               = 5;
+        "on-click"             = "omarchy-menu power";
+        states = {
+          warning  = 20;
+          critical = 10;
+        };
+      };
+
+      bluetooth = {
+        format            = "";
+        "format-disabled"= "󰂲";
+        "format-connected"= "";
+        "tooltip-format"  = "Devices connected: {num_connections}";
+        "on-click"        = "blueberry";
+      };
+
+      pulseaudio = {
+        format        = "{icon}";
+        "on-click"    = "kitty --class=Wiremix -e wiremix";
+        "on-click-right" = "pamixer -t";
+        "tooltip-format" = "Playing at {volume}%";
+        "scroll-step" = 5;
+        "format-muted" = "";
+        "format-icons" = {
+          default = [ "" "" "" ];
+        };
+      };
+      
+      mpris = {
+        format = "{dynamic}";
+        dynamic-order = ["title" "album" "artist" "position" "length"];
+      };
+      
+      cava = {
+        bars = 14;
+        bar_delimiter = 0;
+        format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
+      };
+
+      "group/tray-expander" = {
+        orientation = "inherit";
+        drawer = {
+          "transition-duration" = 600;
+          "children-class"      = "tray-group-item";
+        };
+        modules = [ "custom/expand-icon" "tray" ];
+      };
+
+      "custom/expand-icon" = {
+        format  = "";
+        tooltip = false;
+      };
+
+      tray = {
+        "icon-size" = 12;
+        spacing     = 17;
+      };
+    }
   ];
 
   programs.waybar.style = lib.mkAfter ''
     * {
-      font-family: "Roboto";
-      font-size: 17px;
-      border-radius: 0px;
+      border: none;
+      border-radius: 0;
+      min-height: 0;
+      font-family: 'CaskaydiaMono Nerd Font';
+      font-size: 12px;
     }
 
-    window#waybar {
-      margin: 0 0px;
-    }
-
-    #network {
-      padding-left: 4px;
-      padding-right: 2px;
-    }
-
-    #tray {
-      margin-right: 5px;
-      margin-left: 5px;
-    }
-
-    #cava {
-      margin-left: 5px;
-    }
-    
-    #mpris {
-      padding: 0 5px;
-      margin-left: 5px;
-      margin-right: 5px;
-    }
-
-    /*.modules-left {
-      background: @base02;
-      box-shadow: 0px 0px 5px 0px #101010;
-    }
-
-    .modules-center {
-      background: @base02;
-      box-shadow: 0px 0px 5px 0px #101010;
+    .modules-left {
+      margin-left: 8px;
     }
 
     .modules-right {
-      background: @base02;
-      box-shadow: 0px 0px 5px 0px #101010;
-    }*/
-
-
-    window > box {
-      background-color: transparent;
-      margin-top: 5px;
-      margin-bottom: 5px;
-      margin-left: 5px;
-      margin-right: 5px;
+      margin-right: 8px;
     }
 
-    #pulseaudio-slider slider {
-      min-height: 0px;
-      min-width: 0px;
-      border-radius: 10px;
-
+    #workspaces button {
+      all: initial;
+      padding: 0 6px;
+      margin: 0 1.5px;
+      min-width: 9px;
     }
 
-    #pulseaudio-slider trough {
-      min-width: 60px;
-      border-radius: 10px;
-      background-color: @base0D;
+    #workspaces button.empty {
+      opacity: 0.5;
+    }
+    
+    .modules-left #workspaces button.active {
+      border-bottom: 0px solid @base05;
+    }
+    
+    .modules-left #workspaces button {
+      border-bottom: 0px solid @base05;
     }
 
-    #pulseaudio-slider highlight {
-      background-color: @base0C;
-      border-radius: 10px;
+    #cpu,
+    #battery,
+    #pulseaudio,
+    #custom-omarchy,
+    #custom-screenrecording-indicator,
+    #custom-update {
+      min-width: 12px;
+      margin: 0 7.5px;
+    }
+
+    #tray {
+      margin-right: 16px;
+    }
+
+    #bluetooth {
+      margin-right: 17px;
+    }
+
+    #network {
+      margin-right: 13px;
+    }
+
+    #custom-expand-icon {
+      margin-right: 20px;
+    }
+
+    tooltip {
+      padding: 2px;
+    }
+
+    #custom-update {
+      font-size: 10px;
+    }
+
+    #clock {
+      margin-left: 8.75px;
+    }
+
+    .hidden {
+      opacity: 0;
+    }
+
+    #custom-screenrecording-indicator {
+      min-width: 12px;
+      margin-left: 8.75px;
+      font-size: 10px;
+    }
+
+    #custom-screenrecording-indicator.active {
+      color: #a55555;
     }
   '';
 }

modules/zen/default.nix

@@ -35,6 +35,7 @@
       ExtensionSettings = mkExtensionSettings {
         "uBlock0@raymondhill.net" = "ublock-origin";
 	"search@kagi.com" = "kagi-search-for-firefox";
+	#"adnauseam@rednoise.org" = "adnauseam";
 	"{446900e4-71c2-419f-a6a7-df9c091e268b}" = "bitwarden-password-manager";
       };
       DisableTelemetry = true;