Added Pyprland + Scratchpad

flake.lock

@@ -94,11 +94,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1752979451,
+        "lastModified": 1760703920,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1762962320,
+        "lastModified": 1765010464,
-        "narHash": "sha256-4Bhteu6s5gMGcNSgniKH4ynmN5WcdDA58Vy2vFlHPdg=",
+        "narHash": "sha256-hYHhTChUJLTMyKjf1ScBUKrvEoxnPQrOlDxsg76hs5k=",
         "owner": "abenz1267",
         "repo": "elephant",
-        "rev": "b7acc4fe8a1b6552b071b6b6f2d3a93c8ddec823",
+        "rev": "3f35c11d4d02bb8fb049fe3b0cb2b13631d7a813",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1758112371,
+        "lastModified": 1764724327,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1763759067,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -355,18 +355,20 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1748186689,
+        "host": "gitlab.gnome.org",
-        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
+        "lastModified": 1764524476,
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
-        "type": "github"
+        "type": "gitlab"
       },
       "original": {
+        "host": "gitlab.gnome.org",
         "owner": "GNOME",
-        "ref": "48.2",
+        "ref": "gnome-49",
         "repo": "gnome-shell",
-        "type": "github"
+        "type": "gitlab"
       }
     },
     "home-manager": {
@@ -397,11 +399,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762463325,
+        "lastModified": 1764998300,
-        "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=",
+        "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0562fef070a1027325dd4ea10813d64d2c967b39",
+        "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",
         "type": "github"
       },
       "original": {
@@ -445,11 +447,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1762458772,
+        "lastModified": 1764602408,
-        "narHash": "sha256-PSIdziku8cdYQ27E4Xxn1Qgc9prerJDOqSV0CtQoC3k=",
+        "narHash": "sha256-VWNWzqFAfKib2xNEhkFV1Jhf1Zd01oGZba5wJKwTWFg=",
         "owner": "fiffeek",
         "repo": "hyprdynamicmonitors",
-        "rev": "13fc7f0ce1e15ab96601a19a08e4ddd02ef7ced5",
+        "rev": "8b23f99a9c02e449c88686abf0fe9bb66dd058e1",
         "type": "github"
       },
       "original": {
@@ -855,11 +857,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1762363567,
+        "lastModified": 1764950072,
-        "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
+        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
+        "rev": "f61125a668a320878494449750330ca58b78c557",
         "type": "github"
       },
       "original": {
@@ -893,11 +895,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762618508,
+        "lastModified": 1765129370,
-        "narHash": "sha256-tFRxHd/1cn0nnMHaz4r6WtAJDjujIF3NfIcNs57SOGE=",
+        "narHash": "sha256-oECOMG9TqJfAym8EbcopfvA2+UZQEAnYB/wWEV09OvE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1574446aca715072c9f7d53b14cfe3a1dc5d5a3f",
+        "rev": "09e1d5968ffd4984068413c39e1803e74d436ce7",
         "type": "github"
       },
       "original": {
@@ -918,11 +920,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758998580,
+        "lastModified": 1764773531,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
         "type": "github"
       },
       "original": {
@@ -1081,11 +1083,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1762264356,
+        "lastModified": 1765047449,
-        "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
+        "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
+        "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a",
         "type": "github"
       },
       "original": {
@@ -1235,11 +1237,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1757716333,
+        "lastModified": 1763914658,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
         "type": "github"
       },
       "original": {
@@ -1251,11 +1253,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1757811970,
+        "lastModified": 1764465359,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
         "type": "github"
       },
       "original": {
@@ -1267,11 +1269,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1757811247,
+        "lastModified": 1764464512,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
         "type": "github"
       },
       "original": {
@@ -1289,11 +1291,11 @@
         "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1762788361,
+        "lastModified": 1765009662,
-        "narHash": "sha256-72+WE0RGSW8TgzPijHU6TtLWfMb0G7ojraM5UifTLVg=",
+        "narHash": "sha256-jDplKt9wvUKZOimuNHmeV/perFVMpFt0KVIh+EDd2WY=",
         "owner": "abenz1267",
         "repo": "walker",
-        "rev": "e87c8c36468bcf2042a21c6aa878e7f0cdadc8f0",
+        "rev": "cbd809658b5d99116bbffda49b71616c107f4c80",
         "type": "github"
       },
       "original": {

modules/home/default.nix

@@ -4,9 +4,10 @@
 {
   imports = [
     ./firefox.nix
-    ./ghostty.nix
+    ./foot.nix
+    # ./ghostty.nix
     ./git.nix
-    ./helix.nix
+    # ./helix.nix
     ./hypr
     ./mango.nix
     ./nvf.nix

modules/home/foot.nix

@@ -0,0 +1,17 @@
+{
+  ...
+}:
+{
+  programs.foot = {
+    enable = true;
+    server.enable = false;
+    settings = {
+      main = {
+        term = "xterm-256color";
+      };
+      mouse = {
+        hide-when-typing = "yes";
+      };
+    };
+  };
+}

modules/home/helix.nix

@@ -5,7 +5,6 @@
 {
   programs.helix = {
     enable = true;
-    defaultEditor = true;
     extraPackages = with pkgs; [
       basedpyright
       ruff

modules/home/hypr/default.nix

@@ -3,8 +3,11 @@
 }:
 {
   imports = [
+    ./hypridle.nix
     ./hyprland.nix
+    ./hyprlock.nix
     ./keybinds.nix
     ./monitors.nix
+    ./pyprland.nix
   ];
 }

modules/home/hypr/hypridle.nix

@@ -0,0 +1,30 @@
+{
+  ...
+}:
+{
+  services.hypridle = {
+    enable = true;
+    settings = {
+      general = {
+        lock_cmd = "pidof hyprlock || hyprlock --grace 10";
+        before_sleep_cmd = "loginctl lock-session";
+        fail_timeout = 1000;
+      };
+      listener = [
+        {
+          timeout = 300;
+          on-timeout = "loginctl lock-session";
+        }
+        {
+          timeout = 450;
+          on-timeout = "hyprctl dispatch dpms off";
+          on-resume = "hyprctl dispatch dpms on";
+        }
+        {
+          timeout = 600;
+          on-timeout = "systemctl suspend || loginctl suspend";
+        }
+      ];
+    };
+  };
+}

modules/home/hypr/hyprland.nix

@@ -1,4 +1,5 @@
 {
+  # inputs,
   pkgs,
   config,
   ...
@@ -8,8 +9,12 @@
     hyprpolkitagent
   ];
 
+  # xdg.configFile."uwsm/env".source =
+  #   "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh";
+
   wayland.windowManager.hyprland = {
     enable = true;
+    # systemd.enable = false;
     package = null;
     portalPackage = null;
 
@@ -48,14 +53,19 @@
       ];
 
       exec-once = [
+        "systemctl --user enable --now hypridle.service"
         "systemctl --user enable --now hyprpolkitagent.service"
+        "systemctl --user enable app-com.mitchellh.ghostty.service"
         "wpaperd -d"
-        "systemctl enable --user app-com.mitchellh.ghostty.service"
+        "pypr"
       ];
 
       env = [
         "NIXOS_OZONE_WL, 1"
         "HYPRSHOT_DIR, ${config.xdg.userDirs.extraConfig.XDG_SCREENSHOTS_DIR}"
+        "XDG_CURRENT_DESKTOP, Hyprland"
+        "XDG_SESSION_TYPE, wayland"
+        "XDG_SESSION_DESKTOP, Hyprland"
       ];
     };
   };

modules/home/hypr/hyprlock.nix

@@ -0,0 +1,109 @@
+{
+  config,
+  ...
+}:
+let
+  primary-monitor = "eDP-1";
+
+  text-color = "rgba(${config.lib.stylix.colors.base0F}FF)";
+  entry-background-color = "rgba(${config.lib.stylix.colors.base0F}11)";
+  entry-border-color = "rgba(${config.lib.stylix.colors.base0F}55)";
+  font-family = "Rubik Light";
+in
+{
+  programs.hyprlock = {
+    enable = true;
+    settings = {
+      general = {
+        hide_cursor = true;
+      };
+      background = [
+        {
+          path = "${config.xdg.userDirs.extraConfig.XDG_WALLPAPERS_DIR}/sunset_bay.jpg";
+          blur_passes = 3;
+        }
+      ];
+      input-field = [
+        {
+          monitor = primary-monitor;
+          size = "250, 50";
+          outline_thickness = 2;
+          dots_size = 0.1;
+          dots_spacing = 0.3;
+          outer_color = entry-border-color;
+          inner_color = entry-background-color;
+          font_color = text-color;
+          fade_on_empty = true;
+
+          position = "0, 20";
+          halign = "center";
+          valign = "center";
+        }
+      ];
+      label = [
+        {
+          # Caps Lock Warning
+          monitor = primary-monitor;
+          text = "cmd[update:250] check-capslock";
+          color = text-color;
+          font_size = 13;
+          font_family = font-family;
+          position = "0, -25";
+          halign = "center";
+          valign = "center";
+        }
+        {
+          # Clock
+          monitor = primary-monitor;
+          text = "$TIME";
+          color = text-color;
+          font_size = 65;
+          font_family = font-family;
+
+          position = "0, 300";
+          halign = "center";
+          valign = "center";
+        }
+        {
+          # Date
+          monitor = primary-monitor;
+          text = "cmd[update:5000] date +\"%A, %B %d\"";
+          color = text-color;
+          font_size = 17;
+          font_family = font-family;
+
+          position = "0, 240";
+          halign = "center";
+          valign = "center";
+        }
+        {
+          # User
+          monitor = primary-monitor;
+          text = "    $USER";
+          color = text-color;
+          outline_thickness = 2;
+          dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
+          dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
+          dots_center = true;
+          font_size = 20;
+          font_family = font-family;
+          position = "0, 50";
+          halign = "center";
+          valign = "bottom";
+        }
+        {
+          # Status
+          monitor = primary-monitor;
+          text = "cmd[update:5000] hyprlock-status";
+          color = text-color;
+          font_size = 14;
+          font_family = font-family;
+
+          position = "30, -30";
+          halign = "left";
+          valign = "top";
+        }
+      ];
+    };
+  };
+}

modules/home/hypr/keybinds.nix

@@ -11,7 +11,7 @@
 
     bind = [
       "$mod, Q, killactive"
-      "$mod, W, exec, ghostty +new-window"
+      "$mod, W, exec, foot"
       "$mod, S, exec, walker"
       "$mod, Escape, exec, wlogout"
 
@@ -44,6 +44,9 @@
       ", XF86AudioNext, exec, playerctl next"
       ", XF86AudioMute, exec, pamixer -t"
       "ALT, XF86AudioMute, exec, pamixer --default-source -t"
+
+      # Scratchpads
+      "$mod, TAB, exec, pypr toggle term"
     ]
     ++ (
       # workspaces

modules/home/hypr/pyprland.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    pyprland
+  ];
+
+  xdg.configFile."hypr/pyprland.toml".text = ''
+    [pyprland]
+    plugins = ["scratchpads"]
+
+    [scratchpads.term]
+    command = "foot --app-id term_dropdown"
+    class = "term_dropdown"
+    animation = "fromTop"
+    margin = 150
+    max_size = "1920px 1080px"
+    multi = false
+  '';
+}

modules/home/packages.nix

@@ -9,6 +9,7 @@
     discord
     sqlitebrowser
     drawio
+    check-capslock
 
     # Libre Office
     libreoffice-qt

modules/home/stylix.nix

@@ -21,12 +21,14 @@
     };
     targets = {
       ghostty.enable = true;
+      gtk.enable = true;
       firefox = {
         enable = true;
         profileNames = [ "eclypse" ];
         colorTheme.enable = true;
         firefoxGnomeTheme.enable = true;
       };
+      foot.enable = true;
       lazygit.enable = true;
       starship.enable = true;
       yazi.enable = true;
@@ -40,4 +42,13 @@
     package = pkgs.catppuccin-cursors.mochaDark;
     size = 16;
   };
+
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    iconTheme = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+    };
+  };
 }

modules/home/wlogout.nix

@@ -21,7 +21,7 @@
       }
       {
         label = "logout";
-        action = "loginctl terminate-user $USER";
+        action = "uwsm stop";
         text = "Logout";
         keybind = "e";
       }

modules/home/zsh.nix

@@ -11,6 +11,10 @@
     fastfetch = {
       enable = true;
     };
+    fzf = {
+      enable = true;
+      enableZshIntegration = true;
+    };
     starship = {
       enable = true;
       enableZshIntegration = true;
@@ -95,10 +99,48 @@
         scan_timeout = 100;
       };
     };
+    zoxide = {
+      enable = true;
+      enableZshIntegration = true;
+    };
     zsh = {
       enable = true;
-      enableCompletion = true;
+      enableCompletion = false;
+      antidote = {
+        enable = true;
+        plugins = [
+          "Aloxaf/fzf-tab"
+        ];
+      };
       autosuggestion.enable = true;
+      history = {
+        append = true;
+        findNoDups = true;
+        ignoreSpace = true;
+        ignoreDups = true;
+        saveNoDups = true;
+        share = true;
+      };
+      historySubstringSearch = {
+        enable = true;
+        searchDownKey = "^p";
+        searchUpKey = "^n";
+      };
+      initContent = ''
+        # disable sort when completing `git checkout`
+        zstyle ':completion:*:git-checkout:*' sort false
+        # set descriptions format to enable group support
+        # NOTE: don't use escape sequences (like '%F{red}%d%f') here, fzf-tab will ignore them
+        zstyle ':completion:*:descriptions' format '[%d]'
+        # preview directory's content when completing cd or zoxide
+        zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath'
+        zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath'
+        # custom fzf flags
+        # NOTE: fzf-tab does not follow FZF_DEFAULT_OPTS by default
+        zstyle ':fzf-tab:*' fzf-flags --color=fg:1,fg+:2 --bind=tab:accept
+        # switch group using `<` and `>`
+        zstyle ':fzf-tab:*' switch-group '<' '>'
+      '';
       syntaxHighlighting.enable = true;
       shellAliases = {
         stu = "ssh stu";

modules/overlays/battery-status.sh

@@ -0,0 +1,27 @@
+############ Variables ############
+enable_battery=false
+battery_charging=false
+
+####### Check availability ########
+for battery in /sys/class/power_supply/*BAT*; do
+    if [[ -f "$battery/uevent" ]]; then
+        enable_battery=true
+        if [[ $(cat /sys/class/power_supply/*/status | head -1) == "Charging" ]]; then
+            battery_charging=true
+        fi
+        break
+    fi
+done
+
+############# Output #############
+if [[ $enable_battery == true ]]; then
+    if [[ $battery_charging == true ]]; then
+        echo -n "(+) "
+    fi
+    echo -n "$(cat /sys/class/power_supply/*/capacity | head -1)"%
+    if [[ $battery_charging == false ]]; then
+        echo -n " remaining"
+    fi
+fi
+
+echo ""

modules/overlays/check-capslock.sh

@@ -0,0 +1,7 @@
+MAIN_KB_CAPS=$(hyprctl devices | grep -B 6 "main: yes" | grep "capsLock" | head -1 | awk '{print $2}')
+
+if [ "$MAIN_KB_CAPS" = "yes" ]; then
+    echo "Caps Lock active"
+else
+    echo ""
+fi

modules/overlays/default.nix

@@ -4,5 +4,16 @@
 {
   nixpkgs.overlays = [
     (import ./heybrochecklog.nix)
+
+    (self: super: {
+      # battery-status = prev.writeShellApplication {
+      #   name = "battery-status";
+      #   text = builtins.readFile ./battery-status.sh;
+      # };
+      check-capslock = super.writeShellApplication {
+        name = "check-capslock";
+        text = builtins.readFile ./check-capslock.sh;
+      };
+    })
   ];
 }

modules/system/desktop.nix

@@ -14,11 +14,14 @@ in
   programs = {
     hyprland = {
       enable = true;
+      # withUWSM = true;
       package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
       portalPackage =
         inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+
     };
     mango.enable = true;
+    # uwsm.enable = true;
   };
 
   environment.systemPackages = [
@@ -39,6 +42,7 @@ in
           InputMethod = "qtvirtualkeyboard";
         };
       };
+      wayland.enable = true;
     };
   };
 
@@ -46,7 +50,7 @@ in
   # displayManager.sddm.enable = true;
   # desktopManager.plasma5.enable = true;
 
-  # Enable the System75 Cosmic Desktop Environment
+  # Enable the System76 Cosmic Desktop Environment
   # displayManager.cosmic-greeter.enable = true;
   # desktopManager.cosmic = {
   #   enable = true;

modules/system/fonts.nix

@@ -8,6 +8,7 @@
     fontconfig.enable = true;
     packages = with pkgs; [
       nerd-fonts.fira-code
+      rubik
     ];
   };
 }

modules/system/services.nix

@@ -7,7 +7,7 @@
     xserver = {
       # Enable the X11 windowing system.
       # You can disable this if you're only using the Wayland session.
-      enable = true;
+      enable = false;
 
       # Configure keymap in X11
       xkb = {