diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf index f34d28f5..4748eef5 100644 --- a/home/hyprland/hyprland.conf +++ b/home/hyprland/hyprland.conf @@ -69,6 +69,7 @@ XWayland { # See https://wiki.hyprland.org/Configuring/Keywords/ for more bind = SUPER, Return, exec, wezterm +bind = SUPER SHIFT, Return, exec, pkill rofi || rofi -show ssh bind = SUPER, W, exec, pgrep firefox > /dev/null || firefox bind = SUPER, F1, exec, swaylock diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix index cce876ee..c81b118e 100644 --- a/home/hyprland/rofi/default.nix +++ b/home/hyprland/rofi/default.nix @@ -6,18 +6,15 @@ icon-theme = config.gtk.iconTheme.name; in { imports = [../gtk.nix]; - home.packages = [pkgs.rofi-power-menu]; + home.packages = with pkgs; [rofi-power-menu]; programs.rofi = { enable = true; location = "center"; pass.enable = true; terminal = "wezterm-gui"; - plugins = with pkgs; [ - rofi-file-browser - rofi-top - ]; + plugins = with pkgs; [rofi-file-browser]; extraConfig = { - modi = "run,drun,ssh,top,file-browser-extended,power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; + modi = "run,drun,ssh,file-browser-extended,power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; sort = true; sorting-method = "fzf"; matching = "fuzzy"; @@ -30,7 +27,6 @@ in { display-run = " 󰅴 Commands "; display-drun = " 󱓞 Programs "; display-ssh = " 󰢹 SSH "; - display-top = "  Top "; display-file-browser-extended = " 󰝰 File Browser "; display-power-menu = " 󰩈 Power Menu "; }; diff --git a/home/tui/default.nix b/home/tui/default.nix index b3e5d791..b76f97c9 100644 --- a/home/tui/default.nix +++ b/home/tui/default.nix @@ -1,4 +1,5 @@ { pkgs, tokyonight, ... }: { + home.packages = [ pkgs.pinentry ]; programs = { bat = { enable = true; @@ -18,5 +19,6 @@ builtins.readFile "${tokyonight}/extras/gitui/tokyonight_night.ron"; }; ncspot.enable = true; + rbw.enable = true; }; } diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix index 562adf74..66f229c3 100644 --- a/hosts/Ronin/configuration.nix +++ b/hosts/Ronin/configuration.nix @@ -8,7 +8,6 @@ in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../plasma.nix ../hyprland.nix ../../services/${hostName}.nix ]; @@ -32,7 +31,7 @@ in { ''; programs.light.enable = true; users.users.${user} = userConfig; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.xserver.displayManager.defaultSession = "hyprland"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/desktop.nix b/hosts/desktop.nix index ac6c0ba7..92e22c89 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -5,6 +5,7 @@ let in { imports = [ ./common.nix ]; environment.systemPackages = with pkgs; [ + libnotify sddm-catppuccin-macchiato bitwarden signal-desktop