diff --git a/flake.nix b/flake.nix index e45fd13a..834d61f9 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,8 @@ userConfig = { isNormalUser = true; description = "Evie Litherland-Smith"; - extraGroups = ["networkmanager" "wheel"]; + group = "users"; + extraGroups = ["networkmanager" "wheel" "video"]; shell = pkgs.fish; openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix; }; diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf index 5cea1674..af8b4d70 100644 --- a/home/hyprland/hyprland.conf +++ b/home/hyprland/hyprland.conf @@ -67,16 +67,21 @@ animations { animation = workspaces, 1, 6, default } +XWayland { + force_zero_scaling = true +} + # See https://wiki.hyprland.org/Configuring/Keywords/ for more bind = SUPER, Return, exec, wezterm bind = SUPER SHIFT, Return, exec, wezterm start --always-new-process nvim bind = SUPER, Space, exec, pkill rofi || rofi -show drun -bind = SUPER SHIFT, Space, togglefloating, +bind = SUPER SHIFT, Space, exec, pkill rofi || rofi -show run +bind = SUPER, V, togglefloating, bind = SUPER, W, exec, pgrep firefox > /dev/null || firefox bind = SUPER, E, exec, thunar bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer -bind = SUPER, Q, killactive, -bind = SUPER SHIFT, Q, exec, powermenu +bind = SUPER SHIFT, Q, killactive, +bind = SUPER, P, exec, powermenu bind = SUPER, F1, exec, swaylock bind = SUPER, M, fullscreen, 1 bind = SUPER SHIFT, M, fullscreen, 0 diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix index 03b9ec04..4b7b65ff 100644 --- a/home/hyprland/rofi/default.nix +++ b/home/hyprland/rofi/default.nix @@ -1,20 +1,34 @@ -{config, ...}: let +{ + pkgs, + config, + ... +}: let icon-theme = config.gtk.iconTheme.name; in { imports = [../gtk.nix]; + home.packages = [pkgs.rofi-power-menu]; programs.rofi = { enable = true; - location = "center"; + location = "left"; pass.enable = true; - terminal = "wezterm"; + terminal = "${pkgs.wezterm}/bin/wezterm"; + plugins = with pkgs; [ + rofi-file-browser + rofi-top + ]; extraConfig = { - modi = "drun"; + modi = "run,drun,ssh,top,file-browser-extended,power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; icon-theme = icon-theme; show-icons = true; drun-display-format = "{icon} {name}"; disable-history = false; hide-scrollbar = true; - display-run = "  Run "; + display-run = " 󰅴 Commands "; + display-drun = " 󱓞 Programs "; + display-ssh = " 󰢹 SSH "; + display-top = "  Top "; + display-file-browser-extended = " 󰝰 File Browser "; + display-power-menu = " 󰩈 Power Menu "; }; theme = ./catppuccin-macchiato.rasi; }; diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix index 819c1107..dae94d1c 100644 --- a/home/hyprland/waybar/modules/wlr_workspaces.nix +++ b/home/hyprland/waybar/modules/wlr_workspaces.nix @@ -9,7 +9,7 @@ "3" = "󰈹"; "4" = "󰝰"; "5" = "󰭹"; - "6" = ""; + "6" = "󰢹"; "7" = "󰓓"; "8" = "󰣘"; "9" = "󰣙"; diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix index 2fab9658..879173a5 100644 --- a/hosts/Ronin/configuration.nix +++ b/hosts/Ronin/configuration.nix @@ -29,6 +29,7 @@ in { environment.etc."ppp/options".text = '' ipcp-accept-remote ''; + programs.light.enable = true; users.users.${user} = userConfig; services.greetd.settings = { initial_session.user = user; diff --git a/hosts/desktop.nix b/hosts/desktop.nix index dbfb85b5..cc32a707 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -8,6 +8,7 @@ ./common.nix ]; environment.systemPackages = with pkgs; [ + xdg-utils gsettings-desktop-schemas pavucontrol grim @@ -41,6 +42,10 @@ }; }; }; + xdg.portal = { + enable = true; + extraPortals = with pkgs; [xdg-desktop-portal-gtk]; + }; programs = { hyprland.enable = true; thunar = {