update tlp and bar

flake.nix

@@ -19,24 +19,17 @@
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # sops-nix = {
+    hyprland.url = "github:/hyprwm/hyprland";
-    #   url = "github:Mic92/sops-nix";
+    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
+    # hyprpanel = {
+    #   url = "github:Jas-SinghFSU/HyprPanel";
     #   inputs.nixpkgs.follows = "nixpkgs";
     # };
-    hyprland.url = "github:/hyprwm/Hyprland?submodules=1";
-    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
-    hyprpanel = {
-      url = "github:Jas-SinghFSU/HyprPanel";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     stylix.url = "github:danth/stylix";
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zen-browser.url =
-      "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
@@ -46,7 +39,7 @@
           system = "x86_64-linux";
           modules = [
             {
-              nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+              # nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
               _module.args = { inherit inputs; };
             }
             inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x270 # CHANGEME: check https://github.com/NixOS/nixos-hardware

home/programs/firefox/default.nix

@@ -49,7 +49,7 @@
       search = {
         force = true;
         default = "Searx";
-        order = [ "Searx" "Google" ];
+        order = [ "Searx" "google" ];
         engines = {
           "Nix Packages" = {
             urls = [{
@@ -73,7 +73,7 @@
             urls = [{
               template = "https://nixos.wiki/index.php?search={searchTerms}";
             }];
-            iconUpdateURL = "https://nixos.wiki/favicon.png";
+            icon = "https://nixos.wiki/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = [ "@nw" ];
           };
@@ -81,12 +81,12 @@
             urls = [{
               template = "https://searx.aicampground.com/?q={searchTerms}";
             }];
-            iconUpdateURL = "https://nixos.wiki/favicon.png";
+            icon = "https://nixos.wiki/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = [ "@searx" ];
           };
-          "Bing".metaData.hidden = true;
+          bing.metaData.hidden = true;
-          "Google".metaData.alias =
+          google.metaData.alias =
             "@g"; # builtin engines only support specifying one additional alias
         };
       };
@@ -100,4 +100,5 @@
         ];
     };
   };
+  stylix.targets.firefox.profileNames = [ "dark" ];
 }

home/programs/ghostty/default.nix

@@ -0,0 +1,8 @@
+{
+  programs.ghostty = {
+    enable = true;
+    enableZshIntegration = true;
+    installVimSyntax = true;
+    installBatSyntax = true;
+  };
+}

home/programs/nvim/plugins/cmp.nix

@@ -1,6 +1,7 @@
 {
   programs.nixvim.plugins = {
     luasnip.enable = true;
+    friendly-snippets.enable = true;
     cmp-buffer = { enable = true; };
     cmp-emoji = { enable = true; };
     cmp-nvim-lsp = { enable = true; };

home/programs/nvim/plugins/lsp.nix

@@ -53,7 +53,7 @@
           shfmt.enable = true;
           # golines.enable = true;
           # gofumpt.enable = true;
-          phpcsfixer.enable = true;
+          # phpcsfixer.enable = true;
           elm_format.enable = true;
           blade_formatter = {
             enable = true;

home/programs/nvim/plugins/ui.nix

@@ -3,6 +3,7 @@
   programs.nixvim.plugins = {
     web-devicons.enable = true;
     noice.enable = true;
+    glance.enable = true;
     gitsigns = {
       enable = true;
       settings.current_line_blame = false;

home/programs/nvim/plugins/utils.nix

@@ -8,7 +8,7 @@
       flash.enable = true;
       image = {
         enable = false;
-        integrations.markdown = {
+        settings.integrations.markdown = {
           clearInInsertMode = true;
           onlyRenderImageAtCursor = true;
         };
@@ -17,23 +17,6 @@
       comment.enable = true;
       nvim-autopairs.enable = true;
       todo-comments.enable = true;
-      harpoon = {
-        enable = true;
-        enableTelescope = true;
-        keymapsSilent = true;
-        keymaps = {
-          addFile = "<leader>ha";
-          toggleQuickMenu = "<leader>hu";
-          navNext = "<leader>hl";
-          navPrev = "<leader>hh";
-          navFile = {
-            "1" = "<leader>h1";
-            "2" = "<leader>h2";
-            "3" = "<leader>h3";
-            "4" = "<leader>h4";
-          };
-        };
-      };
       orgmode.enable = false;
       treesitter-context.enable = true;
       nvim-surround.enable = true;

home/programs/pass/default.nix

@@ -11,6 +11,6 @@
     enableZshIntegration = true;
     verbose = true;
     enableScDaemon = false;
-    pinentryPackage = pkgs.pinentry-all;
+    pinentry.package = pkgs.pinentry-all;
   };
 }

home/programs/shell/zsh.nix

@@ -14,7 +14,7 @@ in {
       batdiff
       batgrep
       batwatch
-      prettybat
+      # prettybat
     ];
   };
 
@@ -26,7 +26,7 @@ in {
     syntaxHighlighting.enable = true;
     historySubstringSearch.enable = true;
 
-    initExtraFirst = ''
+    initContent = lib.mkBefore ''
       bindkey -e
       ${if fetch == "neofetch" then
         pkgs.neofetch + "/bin/neofetch"
@@ -95,7 +95,7 @@ in {
       gcu = "git add . && git commit -m 'Update'";
       gp = "git push";
       gpl = "git pull";
-      gs = "git status";
+      gst = "git status";
       gd = "git diff";
       gco = "git checkout";
       gcb = "git checkout -b";

home/scripts/default.nix

@@ -4,8 +4,6 @@
     ./sounds
     ./brightness
     ./caffeine
-    ./hyprpanel
-    ./hyprfocus
     ./night-shift
     ./screenshot
     ./nerdfont_fzf

home/system/dunst/default.nix

@@ -0,0 +1,36 @@
+{ config, lib, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  accent-alt = "#${config.lib.stylix.colors.base03}";
+  background = "#${config.lib.stylix.colors.base00}";
+  background-alt = "#${config.lib.stylix.colors.base01}";
+  foreground = "#${config.lib.stylix.colors.base05}";
+  font = "${config.stylix.fonts.sansSerif.name}";
+  font-size = "${toString config.stylix.fonts.sizes.desktop}";
+
+  inherit (config.var.theme) rounding border-size gaps-in gaps-out;
+in {
+
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        height = 300;
+        offset = "15x15";
+        origin = "top-right";
+        follow = "keyboard";
+        shrink = "no";
+        transparency = 0;
+        separator_height = 2;
+        padding = gaps-in;
+        horizontal_padding = gaps-in;
+        corner_radius = rounding;
+        gap_size = gaps-out;
+        frame_width = border-size;
+        markup = "full";
+        word_wrap = "yes";
+        ellipsize = "middle";
+      };
+    };
+  };
+}

home/system/hyprland/bindings.nix

@@ -1,11 +1,9 @@
 { pkgs, ... }: {
   wayland.windowManager.hyprland.settings = {
     bind = [
-      "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty
+      "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Terminal
       "$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
-      # "$mod,B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser
       "$mod,U, exec, ${pkgs.firefox}/bin/firefox" # Firefox
-      # "$shiftMod,B, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden
       "$shiftMod,Q, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
       "$mod,X, exec, powermenu" # Powermenu
       "$mod,SPACE, exec, menu" # Launcher
@@ -32,14 +30,16 @@
       "$mod,l, movefocus, r" # Move focus Right
       "$mod,k, movefocus, u" # Move focus Up
       "$mod,j, movefocus, d" # Move focus Down
+      "$shiftMod,j, swapnext" # Swap with next client
+      "$shiftMod,k, swapnext, prev" # Swap with previous client
       "$ctrlMod,k, focusmonitor, -1" # Focus previous monitor
       "$ctrlMod,j, focusmonitor, 1" # Focus next monitor
       "$ctrlMod,h, layoutmsg, addmaster" # Add to master
       "$ctrlMod,l, layoutmsg, removemaster" # Remove from master
 
-      "$mod,PRINT, exec, screenshot window" # Screenshot window
+      "$mod,PRINT, exec, screenshot window swappy" # Screenshot window
-      ",PRINT, exec, screenshot monitor" # Screenshot monitor
+      ",PRINT, exec, screenshot monitor swappy" # Screenshot monitor
-      "$shiftMod,PRINT, exec, screenshot region" # Screenshot region
+      "$shiftMod,PRINT, exec, screenshot region swappy" # Screenshot region
       "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit
 
       # "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi
@@ -47,7 +47,6 @@
       "$shiftMod,E, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" # Emoji picker with wofi
       "$mod,F2, exec, night-shift" # Toggle night shift
       "$mod,F3, exec, night-shift" # Toggle night shift
-      "$mod,B, exec, hyprpanel-toggle" # Toggle hyprpanel
     ] ++ (builtins.concatLists (builtins.genList (i:
       let ws = i + 1;
       in [

home/system/hyprland/default.nix

@@ -34,6 +34,8 @@ in {
 
   wayland.windowManager.hyprland = {
     enable = true;
+    systemd.enable = true;
+    systemd.variables = [ "--all" ];
     package =
       inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
     portalPackage =
@@ -45,6 +47,7 @@ in {
       "$ctrlMod" = "SUPER_CTRL";
 
       exec-once = [ "dbus-update-activation-environment --systemd --all" ];
+      ecosystem = { no_update_news = true; };
 
       plugin = { overview = { autoDrag = false; }; };
 
@@ -102,7 +105,10 @@ in {
       };
 
       decoration = {
-        blur = { enabled = if blur then "true" else "false"; };
+        blur = {
+          enabled = if blur then "true" else "false";
+          size = 18;
+        };
         shadow = {
           enabled = true;
           range = 20;
@@ -116,7 +122,7 @@ in {
       master = {
         new_status = true;
         allow_small_split = true;
-        mfact = 0.5;
+        mfact = 0.6;
       };
 
       gestures = { workspace_swipe = true; };
@@ -130,8 +136,34 @@ in {
         new_window_takes_over_fullscreen = 2;
       };
 
-      windowrulev2 =
+      windowrulev2 = [
-        [ "float, tag:modal" "pin, tag:modal" "center, tag:modal" ];
+        "float, tag:modal"
+        "pin, tag:modal"
+        "center, tag:modal"
+        "float, title:^(Media viewer)$"
+
+        # Bitwarden extension
+        "float, title:^(.*Bitwarden Password Manager.*)$"
+
+        # make Firefox/Zen PiP window floating and sticky
+        "float, title:^(Picture-in-Picture)$"
+        "pin, title:^(Picture-in-Picture)$"
+
+        # idle inhibit while watching videos
+        "idleinhibit focus, class:^(mpv|.+exe|celluloid)$"
+        "idleinhibit focus, class:^(zen)$, title:^(.*YouTube.*)$"
+        "idleinhibit fullscreen, class:^(zen)$"
+
+        "dimaround, class:^(gcr-prompter)$"
+        "dimaround, class:^(xdg-desktop-portal-gtk)$"
+        "dimaround, class:^(polkit-gnome-authentication-agent-1)$"
+        "dimaround, class:^(zen)$, title:^(File Upload)$"
+
+        # fix xwayland apps
+        "rounding 0, xwayland:1"
+        "center, class:^(.*jetbrains.*)$, title:^(Confirm Exit|Open Project|win424|win201|splash)$"
+        "size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$"
+      ];
 
       layerrule = [ "noanim, launcher" "noanim, ^ags-.*" ];
 
@@ -151,6 +183,6 @@ in {
       };
     };
   };
-  systemd.user.targets.hyprland-session.Unit.Wants =
+  # systemd.user.targets.hyprland-session.Unit.Wants =
-    [ "xdg-desktop-autostart.target" ];
+  #   [ "xdg-desktop-autostart.target" ];
 }

home/system/hyprland/windowrule.nix

@@ -3,32 +3,36 @@
     windowrulev2 = [
       "workspace 2, class:^(emacs)$"
       "workspace 3, class:^(kitty)$"
+      "workspace 3, class:^(com.mitchellh.ghostty)$"
       "workspace 9, class:^(org.qutebrowser.qutebrowser)$"
       "workspace 9, title:^(Chromium)$"
       "fullscreen, class:^(wlogout)$"
       "float, class:^(Zotero)$"
+      "size 810 200, class:^(Zotero)$,title:^(Quick Format Citation)*$"
       "float, class:^(firefox)$,title:^(Certificate for )*$"
       "float, class:^(firefox)$,title:^(.*Firefox — Sharing Indicator.*)$"
       "float, class:^(firefox)$,title:^(.*Presensi Mahasiswa.*)$"
-      "float, class:(firefox),title:^(Extension)(.*)$"
+      "float, class:^(firefox)$,title:^(Extension)(.*)$"
       "float, class:^(pcmanfm)$,title:^(Confirm File Replacing)$"
       "float, class:^(nemo)$,title:^(Confirm File Replacing)$"
       "float, title:^(Confirm File Replacing)$"
+      "float, class:thunar,title:^(Rename.*)$"
+      "float, class:^(org.inkscape.Inkscape)$"
       "float, class:^(nm-connection-editor)$"
       "float, class:^(.*blueman-manager.*)$"
       "size 530 300, class:^(.*blueman-manager.*)$"
       "move 100%-w-20 40, class:^(.*blueman-manager.*)$"
       "tag +portal, class:^(.*desktop-portal.*)$"
       "noborder, tag:portal"
-      "noblur, class:portal"
+      "noblur, tag:portal"
-      "noshadow, class:portal"
+      "noshadow, tag:portal"
-      "float, class:portal"
+      "float, tag:portal"
-      "pin, class:portal"
+      "pin, tag:portal"
       "pin, class:^(gcr-prompter)$"
       "float, title:^(Volume Control)$"
       "pin, title:^(Volume Control)$"
       "size 560 340, title:^(Volume Control)$"
-      "move 100%-w-30 30, title:^(Volume Control)$"
+      "move 100%-w-40 40, title:^(Volume Control)$"
       "float, class:^(spotube)$"
       "size 660 700, class:^(spotube)$"
       "move 100%-w-20 40, class:^(spotube)$"
@@ -37,6 +41,7 @@
       "float, class:^(thunderbird)$,title:^(Edit Event:)$"
       "float, class:^(thunderbird)$,title:^(An error has occurred)$"
       "float, class:^(thunar)$,title:^(File Operation Progress)$"
+      "float, class:^(firefox)$,title:^(.*Bitwarden Password Manager.*)$"
       "float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
       "size 60% 55%, class:^(nwg-look)$"
       "center, class:^(nwg-look)$"
@@ -44,6 +49,9 @@
       "float, class:^(virt-manager)$,title:^(Virtual Machine Manager)$"
       "size 440 220, class:^(virt-manager)$,title:^(Virtual Machine Manager)$"
       "center, class:^(virt-manager)$,title:^(Virtual Machine Manager)$"
+      "stayfocused,  class:(pinentry-)(.*)" # fix pinentry losing focus
+      "rounding 10, class:kitty"
+      # "float, class:.*xdg-desktop-portal.*"
     ];
   };
 }

home/system/hyprlock/default.nix

@@ -2,88 +2,98 @@
 { config, ... }:
 let
   foreground = "rgba(216, 222, 233, 0.70)";
-  imageStr = "screenshow"; # toString config.stylix.image;
+  imageStr = toString config.stylix.image;
-  font = config.stylix.fonts.serif.name;
+  font = config.stylix.fonts.sansSerif.name;
 in {
   programs.hyprlock = {
     enable = true;
     settings = {
       general = {
-        grace = 5;
+        grace = 3;
         no_fade_in = false;
         disable_loading_bar = false;
       };
 
-      # # BACKGROUND
+      background = {
-      # background = {
+        path = "screenshot";
-      #   monitor = "";
+        blur_passes = 3;
-      #   path = imageStr;
+        blur_size = 6;
-      #   blur_passes = 0;
+        noise = 1.17e-2;
-      #   contrast = 0.8916;
+        contrast = 1.3; # Vibrant!!!
-      #   brightness = 0.7172;
+        brightness = 0.8;
-      #   vibrancy = 0.1696;
+        vibrancy = 0.21;
-      #   vibrancy_darkness = 0.0;
+        vibrancy_darkness = 0.0;
-      # };
+      };
-      #
+
-      # label = [
+      label = [
-      #   {
+        # Hour
-      #     # Day-Month-Date
+        {
-      #     monitor = "";
+          text = ''cmd[update:1000] echo "<b><big> $(date +"%H") </big></b>"'';
-      #     text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"'';
+          color = "#${config.lib.stylix.colors.base06}";
-      #     color = foreground;
+          font_size = 112;
-      #     font_size = 28;
+          font_family = font;
-      #     font_family = font + " Bold";
+          shadow_passes = 2;
-      #     position = "0, 490";
+          shadow_boost = 0.4;
-      #     halign = "center";
+          shadow_size = 4;
-      #     valign = "center";
+          position = "0, 220";
-      #   }
+          halign = "center";
-      #   # Time
+          valign = "center";
-      #   {
+        }
-      #     monitor = "";
+        {
-      #     text = ''cmd[update:1000] echo "<span>$(date +"%I:%M")</span>"'';
+          monitor = "";
-      #     color = foreground;
+          text = ''cmd[update:1000] echo "<b><big> $(date +"%M") </big></b>"'';
-      #     font_size = 160;
+          color = "#${config.lib.stylix.colors.base06}";
-      #     font_family = "steelfish outline regular";
+          font_size = 112;
-      #     position = "0, 370";
+          font_family = font;
-      #     halign = "center";
+          shadow_passes = 2;
-      #     valign = "center";
+          shadow_boost = 0.4;
-      #   }
+          shadow_size = 4;
-      #   # USER
+          position = "0, 80";
-      #   {
+          halign = "center";
-      #     monitor = "";
+          valign = "center";
-      #     text = "    $USER";
+        }
-      #     color = foreground;
+        {
-      #     outline_thickness = 2;
+          monitor = "";
-      #     dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
+          text =
-      #     dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
+            ''cmd[update:18000000] echo "<b><big> "$(date +'%A')" </big></b>"'';
-      #     dots_center = true;
+          color = "#${config.lib.stylix.colors.base07}";
-      #     font_size = 18;
+          font_size = 22;
-      #     font_family = font + " Bold";
+          font_family = font;
-      #     position = "0, -180";
+          position = "0, -10";
-      #     halign = "center";
+          halign = "center";
-      #     valign = "center";
+          valign = "center";
-      #   }
+        }
-      # ];
+        {
-      #
+          monitor = "";
-      # # INPUT FIELD
+          text = ''cmd[update:18000000] echo "<b> "$(date +'%d %b')" </b>"'';
-      # input-field = [{
+          color = "#${config.lib.stylix.colors.base07}";
-      #   monitor = "";
+          font_size = 18;
-      #   size = "300, 60";
+          font_family = font;
-      #   outline_thickness = 2;
+          position = "0, -40";
-      #   dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
+          halign = "center";
-      #   dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
+          valign = "center";
-      #   dots_center = true;
+        }
-      #   outer_color = "rgba(255, 255, 255, 0)";
+      ];
-      #   inner_color = "rgba(255, 255, 255, 0.1)";
+
-      #   font_color = foreground;
+      input-field = [{
-      #   fade_on_empty = false;
+        monitor = "";
-      #   font_family = font + " Bold";
+        size = "250, 50";
-      #   placeholder_text = "<i>🔒 Enter Password</i>";
+        outline_thickness = 3;
-      #   hide_input = false;
+        dots_size = 0.26; # Scale of input-field height, 0.2 - 0.8
-      #   position = "0, -250";
+        dots_spacing = 0.64; # Scale of dots' absolute size, 0.0 - 1.0
-      #   halign = "center";
+        dots_center = true;
-      #   valign = "center";
+        dots_rouding = -1;
-      # }];
+        rounding = 22;
+        outer_color = "#${config.lib.stylix.colors.base00}";
+        inner_color = "#${config.lib.stylix.colors.base00}";
+        font_color = "#${config.lib.stylix.colors.base06}";
+        fade_on_empty = true;
+        placeholder_text =
+          "<i>Password...</i>"; # Text rendered in the input box when it's empty.
+        position = "0, 120";
+        halign = "center";
+        valign = "bottom";
+      }];
     };
   };
 }

home/system/hyprpanel/default.nix

@@ -7,7 +7,7 @@ let
   background = "#${config.lib.stylix.colors.base00}";
   background-alt = "#${config.lib.stylix.colors.base01}";
   foreground = "#${config.lib.stylix.colors.base05}";
-  font = "${config.stylix.fonts.serif.name}";
+  font = "${config.stylix.fonts.sansSerif.name}";
   fontSize = "${toString config.stylix.fonts.sizes.desktop}px";
 
   inherit (config.var.theme) rounding border-size gaps-in gaps-out;
@@ -22,81 +22,36 @@ in {
     overlay.enable = true;
     hyprland.enable = true;
     overwrite.enable = true;
-    layout = {
+    settings = {
-      "bar.layouts" = {
+      layout = {
-        "0" = {
+        bar.layouts = {
-          left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ];
+          "0" = {
-          middle = [ "media" ];
+            left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ];
-          right = [
+            middle = [ "media" ];
-            "systray"
+            right = [
-            "volume"
+              "volume"
-            "hyprsunset"
+              "hyprsunset"
-            "battery"
+              "battery"
-            "network"
+              "network"
-            "cpu"
+              "bluetooth"
-            "clock"
+              "cpu"
-            "notifications"
+              "clock"
-          ];
+              "systray"
-        };
+              "notifications"
-        "*" = {
+            ];
-          left = [ "dashboard" "workspaces" "windowtitle" ];
+          };
-          middle = [ "clock" ];
+          "*" = {
-          right = [ "volume" "notifications" ];
+            left = [ "dashboard" "workspaces" "windowtitle" ];
+            middle = [ "clock" ];
+            right = [ "volume" "notifications" ];
+          };
         };
       };
     };
 
     override = {
-      bar.battery.hideLabelWhenFull = true;
-      bar.bluetooth.label = false;
-      bar.clock.format = "%a, %d %b  %H:%M";
-      bar.customModules.hypridle.label = false;
-      bar.customModules.hyprsunset.label = false;
-      bar.customModules.hyprsunset.temperature = "4500k";
-      bar.launcher.icon = "";
-      bar.media.show_active_only = true;
-      bar.network.label = false;
-      bar.network.truncation_size = 12;
-      bar.volume.label = false;
-      bar.windowtitle.label = true;
-      bar.workspaces.applicationIconEmptyWorkspace = "";
-      bar.workspaces.hideUnoccupied = false;
-      bar.workspaces.monitorSpecific = false;
-      bar.workspaces.numbered_active_indicator = "underline";
-      bar.workspaces.showApplicationIcons = false;
-      bar.workspaces.showIcons = false;
-      bar.workspaces.workspaces = 5;
-      bar.workspaces.show_numbered = true;
-      menus.clock.time.hideSeconds = true;
-      menus.clock.time.military = true;
-      menus.clock.weather.key = weatherapikey;
-      menus.clock.weather.location = location;
-      menus.clock.weather.unit = "metric";
-      menus.dashboard.powermenu.avatar.image =
-        "/home/${username}/.profile_picture.png";
-      menus.dashboard.powermenu.confirmation = false;
-      menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
-      menus.dashboard.shortcuts.left.shortcut1.icon = "";
-      menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
-      menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
-      menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶";
-      menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
-      menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
-      menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔";
-      menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
-      menus.dashboard.shortcuts.left.shortcut4.command = "menu";
-      menus.dashboard.shortcuts.left.shortcut4.icon = "";
-      menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
-      menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
-      menus.dashboard.shortcuts.right.shortcut1.icon = "";
-      menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
-      menus.dashboard.shortcuts.right.shortcut3.command =
-        "screenshot region swappy";
-      menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
-      menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
-      menus.dashboard.stats.enabled = false;
       theme.bar.background =
-        "${background + (if transparentButtons then "00" else "")}";
+        "${background + (if transparent then "00" else "")}";
       theme.bar.border_radius = "${toString rounding}px";
       theme.bar.buttons.background =
         "${(if transparent then background else background-alt)
@@ -117,10 +72,9 @@ in {
       theme.bar.buttons.workspaces.available = accent-alt;
       theme.bar.buttons.workspaces.hover = accent-alt;
       theme.bar.buttons.workspaces.occupied = accent;
-      theme.bar.buttons.y_margins =
+      theme.bar.buttons.y_margins = if transparentButtons then "0" else "8";
-        if floating && transparent then "0" else "8";
       theme.bar.dropdownGap = "3em";
-      theme.bar.floating = if floating then "true" else "false";
+      theme.bar.floating = floating;
       theme.bar.location = position;
       theme.bar.margin_bottom =
         "${if position == "top" then "0" else toString (gaps-in * 2)}px";
@@ -176,6 +130,56 @@ in {
       theme.osd.muted_zero = true;
       theme.osd.orientation = "vertical";
       theme.osd.radius = "${toString rounding}px";
+
+      bar.workspaces.reverse_scroll = true;
+      bar.battery.hideLabelWhenFull = true;
+      bar.bluetooth.label = false;
+      bar.clock.format = "%a, %d %b  %H:%M";
+      bar.customModules.hypridle.label = false;
+      bar.customModules.hyprsunset.label = false;
+      bar.customModules.hyprsunset.temperature = "4500k";
+      bar.launcher.icon = "";
+      bar.media.show_active_only = true;
+      bar.network.label = false;
+      bar.network.truncation_size = 12;
+      bar.volume.label = false;
+      bar.windowtitle.label = true;
+      # bar.workspaces.applicationIconEmptyWorkspace = "";
+      # bar.workspaces.hideUnoccupied = false;
+      bar.workspaces.monitorSpecific = false;
+      # bar.workspaces.numbered_active_indicator = "underline";
+      # bar.workspaces.showApplicationIcons = false;
+      bar.workspaces.show_icons = false;
+      bar.workspaces.workspaces = 5;
+      bar.workspaces.show_numbered = true;
+      menus.clock.time.hideSeconds = true;
+      menus.clock.time.military = true;
+      menus.clock.weather.key = weatherapikey;
+      menus.clock.weather.location = location;
+      menus.clock.weather.unit = "metric";
+      menus.dashboard.powermenu.avatar.image =
+        "/home/${username}/.profile_picture.png";
+      menus.dashboard.powermenu.confirmation = false;
+      menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
+      menus.dashboard.shortcuts.left.shortcut1.icon = "";
+      menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
+      menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
+      menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶";
+      menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
+      menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
+      menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔";
+      menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
+      menus.dashboard.shortcuts.left.shortcut4.command = "menu";
+      menus.dashboard.shortcuts.left.shortcut4.icon = "";
+      menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
+      menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
+      menus.dashboard.shortcuts.right.shortcut1.icon = "";
+      menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
+      menus.dashboard.shortcuts.right.shortcut3.command =
+        "screenshot region swappy";
+      menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
+      menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
+      menus.dashboard.stats.enabled = false;
       wallpaper.enable = false;
     };
   };

home/system/waybar/default.nix

@@ -0,0 +1,216 @@
+{ config, pkgs, ... }:
+let
+  inherit (config.var.theme.bar) position;
+  inherit (config.var.theme) rounding border-size gaps-in gaps-out;
+in {
+  home.packages = with pkgs; [ playerctl ];
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = true;
+      target = "hyprland-session";
+    };
+    settings = [{
+      layer = "top";
+      position = position;
+      modules-left = [
+        "idle_inhibitor"
+        "power-profile-daemon"
+        "backlight"
+        "pulseaudio"
+        "hyprland/workspaces"
+        "hyprland/window"
+      ];
+      modules-center = [ "mpris" ];
+      modules-right = [
+        "battery#1"
+        "battery#2"
+        "cpu"
+        "memory"
+        "temperature"
+        "clock"
+        "privacy"
+        "tray"
+      ];
+      clock = {
+        "format" = "{:%d %B %H:%M}  ";
+        "format-alt" = "{:%A, %d %B %Y (%R)} ";
+        "tooltip-format" = "<tt><small>{calendar}</small></tt>";
+        "calendar" = {
+          "mode" = "year";
+          "mode-mon-col" = 3;
+          "weeks-pos" = "right";
+          "on-scroll" = 1;
+          "format" = {
+            "months" = "<span color='#ffead3'><b>{}</b></span>";
+            "days" = "<span color='#ecc6d9'><b>{}</b></span>";
+            "weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
+            "weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
+            "today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
+          };
+        };
+        actions = {
+          "on-click-right" = "mode";
+          "on-scroll-up" = "shift_up";
+          "on-scroll-down" = "shift_down";
+        };
+      };
+      tray = { spacing = gaps-in; };
+      cpu = { format = " {usage}"; };
+      memory = { format = " {}"; };
+      idle_inhibitor = {
+        format = "{icon}";
+        format-icons = {
+          activated = "";
+          deactivated = "";
+        };
+      };
+      network = {
+        format = "{ifname}";
+        format-wifi = "{essid} ({signalStrength}%) ";
+        format-ethernet = "{ipaddr}/{cidr} 󰈀";
+        format-disconnected = "";
+        tooltip-format = "{ifname} via {gwaddr} 󰈀";
+        tooltip-format-wifi = "{essid} ({signalStrength}%) ";
+        tooltip-format-ethernet = "{ifname} ";
+        tooltip-format-disconnected = "Disconnected";
+        max-length = 50;
+      };
+      temperature = { format = "{temperatureC}󰔄 "; };
+      backlight = {
+        device = "intel_backlight";
+        format = "{icon}";
+        format-icons = [ "󱃓" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ];
+      };
+      "battery#1" = {
+        bat = "BAT0";
+        interval = 90;
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{capacity}";
+        max-length = 2;
+      };
+      "battery#2" = {
+        bat = "BAT1";
+        interval = 90;
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{capacity} {icon}";
+        format-icons = [ "" "" "" "" "" ];
+        max-length = 25;
+      };
+      "hyprland/window" = {
+        format = "{}";
+        rewrite = {
+          "(.*) — Mozilla Firefox" = "󰈹 $1";
+          "(.*) - kitty" = " [$1]";
+        };
+        separate-outputs = true;
+      };
+      "hyprland/workspaces" = {
+        format = "{name}";
+        format-icons = {
+          "2" = "";
+          "3" = "";
+          "9" = "";
+          "active" = "";
+          "default" = "";
+        };
+        # "persistent-workspaces" = {
+        #   "eDP-1" = [ 1 2 3 4 5 ];
+        #   "DP-3" = [ 6 7 8 9 0 ];
+        # };
+      };
+      mpris = {
+        "format" = "{player_icon} {dynamic}";
+        "format-paused" = "{status_icon} <i>{dynamic}</i>";
+        "player-icons" = {
+          "default" = "󰐊";
+          "mpv" = "󰎇";
+        };
+        "dynamic-len" = 30;
+        "status-icons" = { "paused" = "󰏤"; };
+        "ignored-players" = [ "firefox" ];
+      };
+      privacy = {
+        "icon-spacing" = 4;
+        "icon-size" = 18;
+        "transition-duration" = 250;
+        "modules" = [
+          {
+            "type" = "screenshare";
+            "tooltip" = true;
+            "tooltip-icon-size" = 24;
+          }
+          {
+            "type" = "audio-out";
+            "tooltip" = true;
+            "tooltip-icon-size" = 24;
+          }
+          {
+            "type" = "audio-in";
+            "tooltip" = true;
+            "tooltip-icon-size" = 24;
+          }
+        ];
+      };
+      pulseaudio = {
+        "format" = "{volume}%{icon}";
+        "format-bluetooth" = "{volume}%{icon}";
+        "format-muted" = "";
+        "format-icons" = {
+          "headphone" = "";
+          "phone" = "";
+          "portable" = "";
+          "car" = "";
+          "default" = [ "" "" ];
+        };
+        "scroll-step" = 1;
+        "on-click" = "pavucontrol";
+        "ignored-sinks" = [ "Easy Effects Sink" ];
+      };
+      "pulseaudio/slider" = {
+        "min" = 0;
+        "max" = 100;
+        "orientation" = "horizontal";
+      };
+    }];
+
+    style = ''
+      * { border: none; border-radius: 0; }
+      label.module { padding: 0 ${toString gaps-out}px; }
+      #workspaces button {
+          padding-top: ${toString border-size}px;
+          border-bottom: ${toString border-size}px solid transparent;
+      }
+      #workspaces button.focused,
+      #workspaces button.active {
+          border-bottom: ${toString border-size}px solid @base09;
+      }
+      label#battery.1 { padding-right: 0; }
+      label#battery.2 { padding-left: ${toString gaps-in}px; }
+      #privacy, #tray { padding: 0 ${toString gaps-in}px; }
+      #pulseaudio-slider slider {
+          min-height: 0px;
+          min-width: 0px;
+          opacity: 0;
+          background-image: none;
+          border: none;
+          box-shadow: none;
+      }
+      #pulseaudio-slider trough {
+          min-height: 5px;
+          min-width: 80px;
+          border-radius: ${toString rounding}px;
+      }
+      #pulseaudio-slider highlight {
+          min-width: 10px;
+          border-radius: ${toString rounding}px;
+      }
+    '';
+  };
+}

home/system/wofi/default.nix

@@ -5,7 +5,7 @@ let
   background = "#${config.lib.stylix.colors.base00}";
   background-alt = "#${config.lib.stylix.colors.base01}";
   foreground = "#${config.lib.stylix.colors.base05}";
-  font = config.stylix.fonts.serif.name;
+  font = config.stylix.fonts.sansSerif.name;
   rounding = config.var.theme.rounding;
   font-size = config.stylix.fonts.sizes.popups;
 in {

hosts/laptop/configuration.nix

@@ -13,6 +13,7 @@
     ../../nixos/systemd-boot.nix
     ../../nixos/timezone.nix
     ../../nixos/tuigreet.nix
+    ../../nixos/tlp.nix
     ../../nixos/users.nix
     ../../nixos/utils.nix
     ../../nixos/virtualisation.nix
@@ -31,6 +32,7 @@
   # users.users."${config.var.username}".extraGroups = [ "scanner" "lp" ];
   # hardware.sane.enable = true;
 
+  programs.nm-applet.enable = true;
   networking.hosts = {
     "192.168.122.52" = [ "websiteku.lokal" ];
     "127.0.0.1" = [ "dimensi.lokal" "sisfokampus.ddev.site" ];

hosts/laptop/home.nix

@@ -26,7 +26,7 @@
     ../../home/system/hyprland
     ../../home/system/hypridle
     ../../home/system/hyprlock
-    ../../home/system/hyprpanel
+    # ../../home/system/hyprpanel
     ../../home/system/hyprpaper
     ../../home/system/wofi
     ../../home/system/batsignal
@@ -34,12 +34,16 @@
     ../../home/system/mime
     ../../home/system/udiskie
     ../../home/system/clipman
+    ../../home/system/waybar
+    ../../home/system/dunst
 
     # ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
   ];
 
   stylix = {
     targets.gtk.flatpakSupport.enable = false;
+    targets.hyprlock.enable = false;
+    targets.waybar.addCss = false;
     iconTheme = {
       enable = true;
       package = pkgs.qogir-icon-theme;
@@ -117,18 +121,23 @@
       # cava
 
       # Backup
-      # zed-editor
+      zed-editor
       neovide
       inkscape-with-extensions
       # gimp-with-plugins
       gimp
       sqlitebrowser
       sqlite
-      # emacs29-pgtk
+      emacs-pgtk
+      php
+      phpPackages.composer
+      aspell
+      html-tidy
+      stylelint
+      jsbeautifier
       zotero_7
       chromium
       remmina
-      # inputs.zen-browser.packages."${pkgs.system}"
     ];
 
     # Import my profile picture, used by the hyprpanel dashboard

nixos/audio.nix

@@ -1,4 +1,6 @@
-{
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [ pavucontrol ];
+
   security.rtkit.enable = true;
   services.pulseaudio.enable = false;
 

nixos/fonts.nix

@@ -16,13 +16,11 @@
       noto-fonts-cjk-sans
       noto-fonts-emoji
       victor-mono
-      # (nerdfonts.override { fonts = [ "FiraCode" "Meslo" "VictorMono" ]; })
       nerd-fonts.victor-mono
       nerd-fonts.fira-code
       nerd-fonts.meslo-lg
       openmoji-color
       twemoji-color-font
-      inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd
     ];
 
     enableDefaultPackages = false;
@@ -30,8 +28,8 @@
     fontconfig = {
       defaultFonts = {
         monospace = [ "FiraCode Nerd Font Mono" "Noto Color Emoji" ];
-        sansSerif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ];
+        sansSerif = [ "Inter Display" "Noto Color Emoji" ];
-        serif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ];
+        serif = [ "Noto Serif" "Noto Color Emoji" ];
         emoji = [ "Noto Color Emoji" ];
       };
     };

nixos/nix.nix

@@ -15,12 +15,17 @@ in {
     settings = {
       auto-optimise-store = true;
       experimental-features = [ "nix-command" "flakes" ];
-      substituters =
+      substituters = [
-        [ "https://hyprland.cachix.org" "https://devenv.cachix.org" ];
+        "https://cache.nixos.org/?priority=10"
+        "https://nix-community.cachix.org"
+        "https://hyprland.cachix.org"
+        "https://devenv.cachix.org"
+      ];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+        "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
       ];
     };
     gc = {

nixos/tlp.nix

@@ -0,0 +1,28 @@
+{
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_SCALING_GOVERNOR_ON_AC = "performance";
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+
+      CPU_MIN_PERF_ON_AC = 0;
+      CPU_MAX_PERF_ON_AC = 100;
+      CPU_MIN_PERF_ON_BAT = 0;
+      CPU_MAX_PERF_ON_BAT = 60;
+
+      # Optional helps save long term battery health
+      START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge
+      STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
+      START_CHARGE_THRESH_BAT1 = 40; # 40 and bellow it starts to charge
+      STOP_CHARGE_THRESH_BAT1 = 80; # 80 and above it stops charging
+      RESTORE_THRESHOLD_ON_BAT = 1;
+
+      # Networking powersave
+      DEVICES_TO_DISABLE_ON_LAN_CONNECT = "wifi";
+      DEVICES_TO_ENABLE_ON_UNDOCK = "wifi";
+    };
+  };
+}

nixos/utils.nix

@@ -20,7 +20,7 @@ in {
     dbus.enable = true;
     gvfs.enable = true;
     upower.enable = true;
-    power-profiles-daemon.enable = true;
+    # power-profiles-daemon.enable = true;
     udisks2.enable = true;
     devmon.enable = true;
     journald.extraConfig = ''
@@ -62,6 +62,7 @@ in {
     nix-tree
     stevenblack-blocklist
     wlay
+    ldns
   ];
 
   services.logind.extraConfig = ''

themes/stylix/nixy.nix

@@ -44,12 +44,12 @@
         name = "JetBrains Mono Nerd Font";
       };
       sansSerif = {
-        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        package = pkgs.inter;
-        name = "SFProDisplay Nerd Font";
+        name = "Inter Display";
       };
       serif = {
-        package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd;
+        package = pkgs.noto-fonts;
-        name = "SFProDisplay Nerd Font";
+        name = "Noto Serif";
       };
       emoji = {
         package = pkgs.noto-fonts-emoji;
@@ -57,9 +57,9 @@
       };
       sizes = {
         applications = 11;
-        desktop = 12;
+        desktop = 10;
-        popups = 12;
+        popups = 10;
-        terminal = 11;
+        terminal = 10;
       };
     };
 

themes/var/nixy.nix

@@ -11,8 +11,8 @@
 
   bar = {
     position = "top"; # "top" | "bottom"
-    transparent = true;
+    transparent = false;
-    transparentButtons = false;
+    transparentButtons = true;
-    floating = true;
+    floating = false;
   };
 }