summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home/ebisu/fortune/desktop/default.nix3
-rw-r--r--home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix26
-rw-r--r--home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix2
-rw-r--r--home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix1
-rw-r--r--home/ebisu/fortune/desktop/rofi.nix35
-rw-r--r--home/ebisu/fortune/system/terminal/kitty.nix3
6 files changed, 55 insertions, 15 deletions
diff --git a/home/ebisu/fortune/desktop/default.nix b/home/ebisu/fortune/desktop/default.nix
index a69315f..8af173b 100644
--- a/home/ebisu/fortune/desktop/default.nix
+++ b/home/ebisu/fortune/desktop/default.nix
@@ -5,6 +5,7 @@
./waybar
./clipboard.nix
./mako.nix
+ ./rofi.nix
./screenshot.nix
./wlogout.nix
];
@@ -15,9 +16,7 @@
ydotool
swappy
swww
- rofi-wayland
hyprpicker
- rofi-emoji
(pkgs.callPackage ../../../../pkgs/swaddle.nix { })
showmethekey
brightnessctl
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
index 71a8df5..7c31eb4 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
@@ -4,7 +4,8 @@
"$mod" = "SUPER";
"$mail" = "mailspring --password-store=\"gnome-libsecret\" --enable-features=UseOzonePlatform --ozone-platform=wayland";
"$script_path" = "$HOME/.config/hypr/hyprland/scripts";
- "$term" = "kitty";
+ "$terminal" = "kitty";
+ "$top" = "$terminal -e rofi -modi top -show top"; # "$terminal -e htop"
bind =
builtins.concatLists (
@@ -30,8 +31,8 @@
)
++ [
# Scratchpads
- "$mod, apostrophe, exec, hyprctl dispatch togglespecialworkspace simple_calculator"
- "$mod SHIFT, RETURN, exec, hyprctl dispatch togglespecialworkspace simple_terminal"
+ # "$mod, apostrophe, exec, hyprctl dispatch togglespecialworkspace simple_calculator"
+ "$mod SHIFT, return, exec, hyprctl dispatch togglespecialworkspace simple_terminal"
"$mod SHIFT, c, exec, hyprctl dispatch togglespecialworkspace chatgpt"
"$mod SHIFT, s, exec, hyprctl dispatch togglespecialworkspace spotify"
"$mod SHIFT, apostrophe, exec, hyprctl dispatch togglespecialworkspace calculator"
@@ -48,8 +49,9 @@
# "$mod, tab, hycov:toggleoverview"
# "$mod SHIFT, tab, overview:toggle"
- # Emoji picker
- "$mod, GRAVE, exec, rofi -modi emoji -show emoji"
+ # Rofi
+ "$mod, grave, exec, rofi -modi emoji -show emoji"
+ "$mod, apostrophe, exec, rofi -modi emoji -show calc"
# Volume control
"$mod, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
@@ -78,12 +80,12 @@
# Application binds
"$mod, W, exec, $BROWSER"
- "$mod SHIFT, W, exec, $term -e sudo nmtui"
+ "$mod SHIFT, W, exec, $terminal -e sudo nmtui"
"$mod, E, exec, $mail"
- "$mod SHIFT, R, exec, $term -e htop"
+ "$mod SHIFT, R, exec, $top"
"$mod, R, exec, rofi -show run"
"$mod SHIFT, D, exec, bitwarden-desktop"
- "$mod, RETURN, exec, $term"
+ "$mod, RETURN, exec, $terminal"
"$mod SHIFT, N, exec, $BROWSER https://sumi.news"
"$mod, M, exec, spotify"
"$mod SHIFT, M, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
@@ -179,14 +181,14 @@
bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
# Other media keys
- bind = , XF86Calculator, exec, $term -e bc -l
+ bind = , XF86Calculator, exec, $terminal -e bc -l
bind = , XF86Sleep, exec, sudo -A zzz
bind = , XF86WWW, exec, $BROWSER
- bind = , XF86DOS, exec, $term
+ bind = , XF86DOS, exec, $terminal
bind = , XF86ScreenSaver, exec, pidof hyprlock || hyprlock && hyprctl dispatch dpms off
- bind = , XF86TaskPane, exec, $term -e htop
+ bind = , XF86TaskPane, exec, $top
bind = , XF86Mail, exec, $mail
- bind = , XF86MyComputer, exec, $term -e ranger
+ bind = , XF86MyComputer, exec, $terminal -e ranger
bind = , XF86Launch1, exec, hyprctl dispatch dpms off
# Touchpad control
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix
index 50d9262..79dbb83 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix
@@ -43,6 +43,8 @@
"float, class:Lxappearance"
"pseudo, class:fcitx"
"size 50% 50%, title:^(Volume Control)$"
+ "workspace special:rofi, class:Rofi"
+ "float, class:Rofi"
# Application Rules
"float, class:^(transmission-gtk)$"
diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix
index 06498a5..77c98fe 100644
--- a/home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix
@@ -31,5 +31,6 @@
"special:chatgpt, on-created-empty:[float;center;size 65% 75%] thorium --user-data-dir=${config.home.homeDirectory}/.local/share/thorium-browser-chatgpt --app='https://chatgpt.com/'"
"special:spotify, on-created-empty:[float;center;size 65% 90%] ${pkgs.spotify}/bin/spotify"
"special:calculator, on-created-empty:[float;center;size 50% 50%] ${pkgs.qalculate-gtk}/bin/qalculate-gtk"
+ "special:rofi, float, center, size 50% 50%"
];
}
diff --git a/home/ebisu/fortune/desktop/rofi.nix b/home/ebisu/fortune/desktop/rofi.nix
new file mode 100644
index 0000000..26994de
--- /dev/null
+++ b/home/ebisu/fortune/desktop/rofi.nix
@@ -0,0 +1,35 @@
+{
+ pkgs,
+ config,
+ lib,
+ ...
+}:
+{
+ programs.rofi = with pkgs; {
+ enable = true;
+ theme = lib.mkForce "${config.home.homeDirectory}/.cache/wal/colors-rofi-light.rasi";
+
+ plugins = [
+ rofi-emoji
+ rofi-calc
+ rofi-top
+ # rofi-rbw
+ # rofi-bluetooth
+ # rofi-power-menu
+ ];
+
+ extraConfig = {
+ sidebar-mode = true;
+ hide-scrollbar = true;
+ kb-cancel = "Escape,Control+bracketleft";
+ kb-mode-next = "Alt+Right,Shift+Right,Control+Tab";
+ kb-mode-previous = "Alt+Left,Shift+Left,Control+ISO_Left_Tab";
+ # kb-row-select = "";
+ modi = "combi,drun,window,ssh,run";
+ combi-modi = "window,drun,run,ssh";
+ show = "combi";
+ monitor = "-4";
+ terminal = "kitty";
+ };
+ };
+}
diff --git a/home/ebisu/fortune/system/terminal/kitty.nix b/home/ebisu/fortune/system/terminal/kitty.nix
index ef909fc..bf20b17 100644
--- a/home/ebisu/fortune/system/terminal/kitty.nix
+++ b/home/ebisu/fortune/system/terminal/kitty.nix
@@ -1,3 +1,4 @@
+{ config, ... }:
{
programs.kitty = {
enable = true;
@@ -22,7 +23,7 @@
window_border_width = 0;
window_margin_width = 15;
hide_window_decorations = "titlebar-only";
- include = "~/.cache/wal/colors-kitty.conf";
+ include = "${config.xdg.cacheHome}/wal/colors-kitty.conf";
# Cursor
cursor_blink_interval = 0; # 0.5