diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index ac08bc29..0fc9d7bb 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -73,7 +73,7 @@ enable = true; }; ghostty = { - enable = false; + enable = true; }; gimp = { enable = false; diff --git a/modules/home/programs/hyprland/keybinds.nix b/modules/home/programs/hyprland/keybinds.nix index b57ac572..b9e6f36b 100644 --- a/modules/home/programs/hyprland/keybinds.nix +++ b/modules/home/programs/hyprland/keybinds.nix @@ -24,11 +24,11 @@ in { # Common Keybind Variables "$fileManager" = "thunar"; "$yazi" = "foot -e yazi"; - "$launcher" = "tuirun"; + "$launcher" = "rofi -show drun"; bind = [ - "$mod, SPACE, exec, uwsm app -T $launcher" - "$mod, R, exec, uwsm app -T $launcher" + "$mod, SPACE, exec, uwsm app -- $launcher" + "$mod, R, exec, uwsm app -- $launcher" "$mod, L, exec, ${toggle "nwg-bar"}" "$mod SHIFT, B, exec, pkill -SIGUSR2 waybar" "$mod, A, exec, pkill -SIGUSR1 waybar" @@ -95,7 +95,7 @@ in { (mkIf (host == "cnix") { wayland.windowManager.hyprland.settings = { - "$terminal" = "wezterm"; + "$terminal" = "ghostty"; "$browser" = "zen"; "$browserinc" = "zen --private-window"; "$mod" = "SUPER"; diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix index cef020d5..74e28080 100644 --- a/modules/home/programs/misc/default.nix +++ b/modules/home/programs/misc/default.nix @@ -67,6 +67,7 @@ in { zip gnutar p7zip + unrar ]; }; } diff --git a/modules/home/programs/rofi/style.rasi b/modules/home/programs/rofi/style.rasi index 7d9f2630..c65e65ac 100644 --- a/modules/home/programs/rofi/style.rasi +++ b/modules/home/programs/rofi/style.rasi @@ -1,186 +1,178 @@ -/* ========================================================================== - Rofi color theme - - Based on the Gruvbox color scheme for Vim by morhetz - https://github.com/morhetz/gruvbox - - File: gruvbox-dark-soft.rasi - Desc: Gruvbox dark (soft contrast) color theme for Rofi - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:04:37 PST -0800 - ========================================================================== */ - * { - /* Theme settings */ - highlight: bold italic; - scrollbar: true; - - /* Gruvbox dark colors */ - gruvbox-dark-bg0-soft: #32302f; - gruvbox-dark-bg1: #3c3836; - gruvbox-dark-bg3: #665c54; - gruvbox-dark-fg0: #fbf1c7; - gruvbox-dark-fg1: #ebdbb2; - gruvbox-dark-red-dark: #cc241d; - gruvbox-dark-red-light: #fb4934; - gruvbox-dark-yellow-dark: #d79921; - gruvbox-dark-yellow-light: #fabd2f; - gruvbox-dark-gray: #a89984; - - /* Theme colors */ - background: @gruvbox-dark-bg0-soft; - background-color: @background; - foreground: @gruvbox-dark-fg1; - border-color: @gruvbox-dark-gray; - separatorcolor: @border-color; - scrollbar-handle: @border-color; - - normal-background: @background; - normal-foreground: @foreground; - alternate-normal-background: @gruvbox-dark-bg1; - alternate-normal-foreground: @foreground; - selected-normal-background: @gruvbox-dark-bg3; - selected-normal-foreground: @gruvbox-dark-fg0; - - active-background: @gruvbox-dark-yellow-dark; - active-foreground: @background; - alternate-active-background: @active-background; - alternate-active-foreground: @active-foreground; - selected-active-background: @gruvbox-dark-yellow-light; - selected-active-foreground: @active-foreground; - - urgent-background: @gruvbox-dark-red-dark; - urgent-foreground: @background; - alternate-urgent-background: @urgent-background; - alternate-urgent-foreground: @urgent-foreground; - selected-urgent-background: @gruvbox-dark-red-light; - selected-urgent-foreground: @urgent-foreground; -} -/* ========================================================================== - File: gruvbox-common.rasi - Desc: Shared rules between all gruvbox themes - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:06:47 PST -0800 - ========================================================================== */ - -window { - background-color: @background; - border: 2; - padding: 2; + selected-normal-foreground: #fbf1c7; + foreground: #ebdbb2; + normal-foreground: @foreground; + alternate-normal-background: @background; + selected-urgent-foreground: @selected-normal-foreground; + urgent-foreground: @selected-normal-foreground; + alternate-urgent-background: @selected-normal-background; + active-foreground: #45403d; + selected-active-foreground: @active-foreground; + alternate-active-background: #32302f; + background: #32302f; + alternate-normal-foreground: @foreground; + normal-background: @background; + selected-normal-background: #5a524c; + spacing: 2px; + separatorcolor: #4c7a5d; + urgent-background: #4c3432; + selected-urgent-background: @selected-normal-background; + alternate-urgent-foreground: @urgent-foreground; + background-color: @background; + alternate-active-foreground: @active-foreground; + active-background: @background; + selected-active-background: @selected-normal-background; + prompt-foreground: #fbf1c7; } -mainbox { - border: 0; - padding: 0; +#window { + background-color: @background; + border-color: @separatorcolor; + border: 1px; + border-radius: 5px; + padding: 5px; + width: 25%; } -message { - border: 2px 0 0; - border-color: @separatorcolor; - padding: 1px; +#mainbox { + border: 0; + padding: 2px; } -textbox { - highlight: @highlight; - text-color: @foreground; +#message { + border: 2px 0px 0px; + border-color: @separatorcolor; + padding: 1px; } -listview { - border: 2px solid 0 0; - padding: 2px 0 0; - border-color: @separatorcolor; - spacing: 2px; - scrollbar: @scrollbar; +#textbox { + text-color: @foreground; } -element { - border: 0; - padding: 2px; +#listview { + fixed-height: 0; + border: 1px 0px 0px ; + border-color: @separatorcolor; + spacing: 5px; + scrollbar: false; + padding: 10px 0px 0px ; + lines: 10; } -element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; +#element { + border: 0; + padding: 3px; + cursor: pointer; + spacing: 5px; } -element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; +#element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; +} +#element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} +#element.normal.active { + background-color: @active-background; + text-color: @active-foreground; +} +#element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +#element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; +} +#element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} +#element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; +} +#element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; +} +#element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; } -element.normal.active { - background-color: @active-background; - text-color: @active-foreground; +#element-text { + background-color: transparent; + cursor: inherit; + highlight: inherit; + text-color: inherit; } -element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; +#element-icon { + background-color: transparent; + size: 1em; + cursor: inherit; + text-color: inherit; } -element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; +#scrollbar { + width: 4px ; + border: 0; + handle-width: 8px ; + padding: 0; + handle-color: var(normal-foreground); } -element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; +#sidebar { + border-color: @separatorcolor; + border: 2px dash 0 0; } -element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; +#mode-switcher { + border: 2px 0px 0px ; + border-color: @separatorcolor; } -element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; +#button { + cursor: pointer; + spacing: 0; + text-color: @normal-foreground; } -element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; +#button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; } -scrollbar { - width: 4px; - border: 0; - handle-color: @scrollbar-handle; - handle-width: 8px; - padding: 0; +#inputbar { + spacing: 5px; + text-color: @normal-foreground; + padding: 3px ; } -sidebar { - border: 2px 0 0; - border-color: @separatorcolor; +#case-indicator { + spacing: 0; + text-color: @normal-foreground; } -inputbar { - spacing: 0; - text-color: @normal-foreground; - padding: 2px; - children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; +#entry { + spacing: 0; + text-color: @normal-foreground; } -case-indicator, -entry, -prompt, -button { - spacing: 0; - text-color: @normal-foreground; +#prompt { + spacing: 0; + text-color: @prompt-foreground; } -button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; +#textbox-prompt-colon { + expand: false; + str: ":"; + text-color: @prompt-foreground; } -textbox-prompt-sep { - expand: false; - str: ":"; - text-color: @normal-foreground; - margin: 0 0.3em 0 0; +#inputbar { + children: [prompt,entry,case-indicator]; } diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index 81065789..4c69df45 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -85,7 +85,7 @@ enable = true; }; rofi = { - enable = false; + enable = true; }; ssh = { enable = true; @@ -100,7 +100,7 @@ enable = true; }; wezterm = { - enable = true; + enable = false; }; yazi = { enable = true;