changed hyprland dot.

Signed-off-by: elwrcl <[email protected]>

flake.nix

@@ -24,8 +24,8 @@
       url = "github:Lyndeno/apple-fonts.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    noctalia = {
+    illogical-flake = {
-      url = "github:noctalia-dev/noctalia-shell";
+      url = "github:soymou/illogical-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

home/default.nix

@@ -8,6 +8,7 @@
 {
   imports = [
     ./hyprland.nix
+    inputs.illogical-flake.homeManagerModules.default
   ];
 
   home.username = "elars";
@@ -30,6 +31,15 @@
     initContent = builtins.readFile ./dots/zsh/.zshrc;
   };
 
+  programs.illogical-impulse = {
+    enable = true;
+    dotfiles = {
+      fish.enable = false;
+      kitty.enable = false;
+      starship.enable = false;
+    };
+  };
+
   programs.ghostty = {
     enable = true;
     settings = {

home/hypr/hyprland/execs.nix

@@ -3,7 +3,7 @@
 {
   wayland.windowManager.hyprland.settings = {
     exec-once = [
-      "sleep 1 && noctalia-shell"
+      "qs -c ii"
       "hyprctl setcursor Bibata-Modern-Classic 24"
       "easyeffects --hide-window --service-mode"
       "wl-paste --type text --watch cliphist store"

home/hypr/hyprland/general.nix

@@ -65,7 +65,7 @@
 
     misc = {
       disable_hyprland_logo = true;
-      disable_splash_rendering = true;
+      disable_splash_rendering = true;<
       mouse_move_enables_dpms = true;
       key_press_enables_dpms = true;
       animate_manual_resizes = false;

home/hypr/hyprland/keybinds.nix

@@ -1,121 +1,159 @@
 { ... }:
 
 let
-  ipc = "noctalia-shell ipc call";
+  qs = "qs -c ii ipc call";
+  qsFallback = cmd: "qs -c ii ipc call TEST_ALIVE || ${cmd}";
 in
 {
   wayland.windowManager.hyprland.settings = {
     "$mainMod" = "SUPER";
 
-    bindr = [
+    # global binds (ill)
-      "$mainMod, SUPER_L, exec, ${ipc} launcher toggle"
+    bindid = [
+      "Super, SUPER_L, Toggle search, global, quickshell:searchToggleRelease"
+      "Super, SUPER_R, Toggle search, global, quickshell:searchToggleRelease"
+    ];
+
+    binditn = [
+      "Super, catchall, global, quickshell:searchToggleReleaseInterrupt"
+    ];
+
+    bindit = [
+      ", Super_L, global, quickshell:workspaceNumber"
+      ", Super_R, global, quickshell:workspaceNumber"
     ];
 
     bind = [
-      # workspace
+      # qs fallback
+      "Super, SUPER_L, exec, ${qsFallback "fuzzel"}"
+      "Super, SUPER_R, exec, ${qsFallback "fuzzel"}"
+      "Ctrl, Super_L, global, quickshell:searchToggleReleaseInterrupt"
+      "Ctrl, Super_R, global, quickshell:searchToggleReleaseInterrupt"
+
+      # qs toggles
+      "Super, Tab,           global, quickshell:overviewWorkspacesToggle"
+      "Super, A,             global, quickshell:sidebarLeftToggle"
+      "Super, N,             global, quickshell:sidebarRightToggle"
+      "Super, V,             global, quickshell:overviewClipboardToggle"
+      "Super, Period,        global, quickshell:overviewEmojiToggle"
+      "Super, Comma,         global, quickshell:cheatsheetToggle"
+      "Super, J,             global, quickshell:barToggle"
+      "Super, M,             global, quickshell:mediaControlsToggle"
+      "Ctrl Alt, Delete,     global, quickshell:sessionToggle"
+      "Ctrl Super, T,        global, quickshell:wallpaperSelectorToggle"
+      "Ctrl Super, R,        exec, killall qs quickshell; qs -c ii &"
+      "Ctrl Super, P,        global, quickshell:panelFamilyCycle"
+
+      # cb-ss-misc
+      "Super, V,             exec, ${qsFallback "cliphist list | fuzzel --match-mode fzf --dmenu | cliphist decode | wl-copy"}"
+      "Super, Period,        exec, ${qsFallback "fuzzel"}"
+      "Super Shift, S,       global, quickshell:regionScreenshot"
+      "Super Shift, S,       exec, ${qsFallback "hyprshot --freeze --clipboard-only --mode region --silent"}"
+      "Super Shift, A,       global, quickshell:regionSearch"
+      "Super Shift, X,       global, quickshell:regionOcr"
+      "Super Shift, C,       exec, hyprpicker -a"
+      ", Print,              exec, grim - | wl-copy"
+
+      # rec
+      "Super Shift, R,       global, quickshell:regionRecord"
+
+      # loc/session
+      "Super, L,             exec, loginctl lock-session"
+      "Super Shift, L,       exec, systemctl suspend"
+
+      # Apps
+      "Super, Return,        exec, ghostty"
+      "Super, W,             exec, zen-beta"
+      "Super, E,             exec, nautilus"
+      "Super, Z,             exec, zeditor"
+      "Ctrl Alt, T,          exec, ghostty"
+      "Super Alt, V,         exec, pavucontrol"
+      "Ctrl Shift, Escape,   exec, ghostty -e btop"
+
+      # win management
+      "Super, Q,             killactive"
+      "Super Alt, SPACE,     togglefloating"
+      "Super, F,             fullscreen, 0"
+      "Super, D,             fullscreen, 1"
+      "Super, P,             pin"
+
+      # scrolling
       "CTRL $mainMod, right, layoutmsg, focus r"
       "CTRL $mainMod, left,  layoutmsg, focus l"
       "CTRL $mainMod, down,  workspace, r+1"
       "CTRL $mainMod, up,    workspace, r-1"
+      "Super, left,          movefocus, l"
+      "Super, right,         movefocus, r"
+      "Super, up,            movefocus, u"
+      "Super, down,          movefocus, d"
+
+      # move win
       "CTRL $mainMod SHIFT, right, layoutmsg, movewindowto r"
       "CTRL $mainMod SHIFT, left,  layoutmsg, movewindowto l"
       "CTRL $mainMod SHIFT, down,  movetoworkspace, r+1"
       "CTRL $mainMod SHIFT, up,    movetoworkspace, r-1"
+      "Super Shift, left,   layoutmsg, movewindowto l"
+      "Super Shift, right,  layoutmsg, movewindowto r"
+      "Super Shift, up,     movewindow, u"
+      "Super Shift, down,   movewindow, d"
+
+      # scroll layout
       "$mainMod, R,         layoutmsg, colresize +conf"
       "$mainMod, C,         layoutmsg, center"
       "$mainMod SHIFT, R,   layoutmsg, colresize 0.7"
 
-      # interface
+      # wspace
-      "$mainMod, P,           exec, ${ipc} bar toggle"
+      "Super, code:10,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 1"
-      "CTRL ALT, Delete,      exec, ${ipc} sessionMenu toggle"
+      "Super, code:11,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 2"
-      # plugins
+      "Super, code:12,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 3"
-      "$mainMod SHIFT, S,     exec, ${ipc} plugin:screen-shot-and-record screenshot"
+      "Super, code:13,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 4"
-      "$mainMod SHIFT, Z,     exec, ${ipc} plugin:screen-shot-and-record search"
+      "Super, code:14,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 5"
-      "$mainMod SHIFT, X,     exec, ${ipc} plugin:screen-shot-and-record ocr"
+      "Super, code:15,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 6"
-      "$mainMod SHIFT, C,     exec, ${ipc} plugin:music panel"
+      "Super, code:16,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 7"
-      # launchers
+      "Super, code:17,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 8"
-      "$mainMod, Return,      exec, ghostty"
+      "Super, code:18,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 9"
-      "$mainMod, W,           exec, zen-beta"
+      "Super, code:19,  exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh workspace 10"
-      "$mainMod, E,           exec, nautilus"
-      "$mainMod, Z,           exec, zeditor"
-      "$mainMod ALT, V,       exec, pavucontrol"
-      "$mainMod SHIFT, V,     exec, ${ipc} launcher clipboard"
-      "$mainMod SHIFT, L,     exec, ${ipc} lockScreen lock"
-      "CTRL SHIFT, Escape,      exec, ghostty -e btop"
 
-      # window management
+      "Super Alt, code:10, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 1"
-      "$mainMod, Q,           killactive"
+      "Super Alt, code:11, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 2"
-      "$mainMod ALT, SPACE,   togglefloating"
+      "Super Alt, code:12, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 3"
-      "$mainMod, F,           fullscreen, 0"
+      "Super Alt, code:13, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 4"
-      "$mainMod, D,           fullscreen, 1"
+      "Super Alt, code:14, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 5"
-      "$mainMod ALT, P,       pin"
+      "Super Alt, code:15, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 6"
+      "Super Alt, code:16, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 7"
+      "Super Alt, code:17, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 8"
+      "Super Alt, code:18, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 9"
+      "Super Alt, code:19, exec, ~/.config/hypr/hyprland/scripts/workspace_action.sh movetoworkspacesilent 10"
 
-      # focus windows
+      "Ctrl Super, Right,   workspace, r+1"
-      "$mainMod, left,  layoutmsg, move -col"
+      "Ctrl Super, Left,    workspace, r-1"
-      "$mainMod, right, layoutmsg, move +col"
+      "Super, Page_Down,    workspace, +1"
-      "$mainMod, up,    movefocus, u"
+      "Super, Page_Up,      workspace, -1"
-      "$mainMod, down,  movefocus, d"
 
-      "$mainMod SHIFT, left,  layoutmsg, movewindowto l"
+      # special workspace
-      "$mainMod SHIFT, right, layoutmsg, movewindowto r"
+      "Super, S,            togglespecialworkspace"
-      "$mainMod SHIFT, up,    movewindow, u"
+      "Super Alt, S,        movetoworkspacesilent, special"
-      "$mainMod SHIFT, down,  movewindow, d"
 
-      # workspace navigation
+      # media
-      "$mainMod, 1, workspace, 1"
+      "Super Shift, N,      exec, playerctl next"
-      "$mainMod, 2, workspace, 2"
+      "Super Shift, B,      exec, playerctl previous"
-      "$mainMod, 3, workspace, 3"
+      "Super Shift, P,      exec, playerctl play-pause"
-      "$mainMod, 4, workspace, 4"
-      "$mainMod, 5, workspace, 5"
-      "$mainMod, 6, workspace, 6"
-      "$mainMod, 7, workspace, 7"
-      "$mainMod, 8, workspace, 8"
-      "$mainMod, 9, workspace, 9"
-      "$mainMod, 0, workspace, 10"
-
-      # move windows to workspace
-      "$mainMod SHIFT, 1, movetoworkspace, 1"
-      "$mainMod SHIFT, 2, movetoworkspace, 2"
-      "$mainMod SHIFT, 3, movetoworkspace, 3"
-      "$mainMod SHIFT, 4, movetoworkspace, 4"
-      "$mainMod SHIFT, 5, movetoworkspace, 5"
-      "$mainMod SHIFT, 6, movetoworkspace, 6"
-      "$mainMod SHIFT, 7, movetoworkspace, 7"
-      "$mainMod SHIFT, 8, movetoworkspace, 8"
-      "$mainMod SHIFT, 9, movetoworkspace, 9"
-      "$mainMod SHIFT, 0, movetoworkspace, 10"
-
-      # special workspaces
-      "$mainMod, S,       togglespecialworkspace"
-      "$mainMod ALT, S,   movetoworkspacesilent, special"
-
-      #  mouse workspace navigation
-      "$mainMod, mouse_up,   workspace, +1"
-      "$mainMod, mouse_down, workspace, -1"
-
-      # media keys
-      "$mainMod SHIFT, N, exec, playerctl next"
-      "$mainMod SHIFT, B, exec, playerctl previous"
-      "$mainMod SHIFT, P, exec, playerctl play-pause"
     ];
 
-    # mouse binds
     bindm = [
-      "$mainMod, mouse:272, movewindow"
+      "Super, mouse:272, movewindow"
-      "$mainMod, mouse:273, resizewindow"
+      "Super, mouse:273, resizewindow"
     ];
 
-    # volume and brightness binds
+    bindle = [
-    bindel = [
+      ", XF86MonBrightnessUp,   exec, ${qs} brightness increment || brightnessctl s 5%+"
-      ", XF86AudioRaiseVolume,   exec, ${ipc} volume increase"
+      ", XF86MonBrightnessDown, exec, ${qs} brightness decrement || brightnessctl s 5%-"
-      ", XF86AudioLowerVolume,   exec, ${ipc} volume decrease"
+      ", XF86AudioRaiseVolume,  exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+ -l 1.5"
-      ", XF86MonBrightnessUp,    exec, ${ipc} brightness increase"
+      ", XF86AudioLowerVolume,  exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-"
-      ", XF86MonBrightnessDown,  exec, ${ipc} brightness decrease"
     ];
 
-    # volume and media keys
     bindl = [
-      ", XF86AudioMute,    exec, ${ipc} volume muteOutput"
+      ", XF86AudioMute,    exec, wpctl set-mute @DEFAULT_SINK@ toggle"
       ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle"
       ", XF86AudioNext,    exec, playerctl next"
       ", XF86AudioPrev,    exec, playerctl previous"

machine.nix

@@ -24,7 +24,6 @@ in
   environment.systemPackages = packages.system ++ [
     inputs.helium.packages.${system}.default
     inputs.zen-browser.packages.${system}.default
-    inputs.noctalia.packages.${system}.default
     inputs.copetch.packages.${system}.default
   ];
   environment.pathsToLink = [

nixos/services/performance/default.nix

@@ -8,4 +8,5 @@
   services.irqbalance.enable = true;
   services.power-profiles-daemon.enable = true;
   services.upower.enable = true;
+  services.geoclue2.enable = true;
 }

nixos/system/fonts/default.nix

@@ -9,6 +9,8 @@
   fonts = {
     packages = with pkgs; [
       noto-fonts
+      rubik
+      nerd-fonts.ubuntu
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-color-emoji

nixos/system/nix/default.nix

@@ -13,14 +13,12 @@
     substituters = [
       "https://cache.nixos.org"
       "https://nix-community.cachix.org"
-      "https://noctalia.cachix.org"
       "https://attic.xuyh0120.win/lantian"
       "https://hyprland.cachix.org"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
       "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
     ];