Enable light/sound control for laptop (hopefully)

Add extra rofi modes (ssh, power, files)

Add extra XDG settings for hyprland
This commit is contained in:
Evie Litherland-Smith 2023-07-18 09:15:40 +01:00
parent db9f2240ae
commit bb2992c784
6 changed files with 36 additions and 10 deletions

View file

@ -28,7 +28,8 @@
userConfig = { userConfig = {
isNormalUser = true; isNormalUser = true;
description = "Evie Litherland-Smith"; description = "Evie Litherland-Smith";
extraGroups = ["networkmanager" "wheel"]; group = "users";
extraGroups = ["networkmanager" "wheel" "video"];
shell = pkgs.fish; shell = pkgs.fish;
openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix; openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix;
}; };

View file

@ -67,16 +67,21 @@ animations {
animation = workspaces, 1, 6, default animation = workspaces, 1, 6, default
} }
XWayland {
force_zero_scaling = true
}
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
bind = SUPER, Return, exec, wezterm bind = SUPER, Return, exec, wezterm
bind = SUPER SHIFT, Return, exec, wezterm start --always-new-process nvim bind = SUPER SHIFT, Return, exec, wezterm start --always-new-process nvim
bind = SUPER, Space, exec, pkill rofi || rofi -show drun 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, W, exec, pgrep firefox > /dev/null || firefox
bind = SUPER, E, exec, thunar bind = SUPER, E, exec, thunar
bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer
bind = SUPER, Q, killactive, bind = SUPER SHIFT, Q, killactive,
bind = SUPER SHIFT, Q, exec, powermenu bind = SUPER, P, exec, powermenu
bind = SUPER, F1, exec, swaylock bind = SUPER, F1, exec, swaylock
bind = SUPER, M, fullscreen, 1 bind = SUPER, M, fullscreen, 1
bind = SUPER SHIFT, M, fullscreen, 0 bind = SUPER SHIFT, M, fullscreen, 0

View file

@ -1,20 +1,34 @@
{config, ...}: let {
pkgs,
config,
...
}: let
icon-theme = config.gtk.iconTheme.name; icon-theme = config.gtk.iconTheme.name;
in { in {
imports = [../gtk.nix]; imports = [../gtk.nix];
home.packages = [pkgs.rofi-power-menu];
programs.rofi = { programs.rofi = {
enable = true; enable = true;
location = "center"; location = "left";
pass.enable = true; pass.enable = true;
terminal = "wezterm"; terminal = "${pkgs.wezterm}/bin/wezterm";
plugins = with pkgs; [
rofi-file-browser
rofi-top
];
extraConfig = { 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; icon-theme = icon-theme;
show-icons = true; show-icons = true;
drun-display-format = "{icon} {name}"; drun-display-format = "{icon} {name}";
disable-history = false; disable-history = false;
hide-scrollbar = true; 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; theme = ./catppuccin-macchiato.rasi;
}; };

View file

@ -9,7 +9,7 @@
"3" = "󰈹"; "3" = "󰈹";
"4" = "󰝰"; "4" = "󰝰";
"5" = "󰭹"; "5" = "󰭹";
"6" = ""; "6" = "󰢹";
"7" = "󰓓"; "7" = "󰓓";
"8" = "󰣘"; "8" = "󰣘";
"9" = "󰣙"; "9" = "󰣙";

View file

@ -29,6 +29,7 @@ in {
environment.etc."ppp/options".text = '' environment.etc."ppp/options".text = ''
ipcp-accept-remote ipcp-accept-remote
''; '';
programs.light.enable = true;
users.users.${user} = userConfig; users.users.${user} = userConfig;
services.greetd.settings = { services.greetd.settings = {
initial_session.user = user; initial_session.user = user;

View file

@ -8,6 +8,7 @@
./common.nix ./common.nix
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
xdg-utils
gsettings-desktop-schemas gsettings-desktop-schemas
pavucontrol pavucontrol
grim grim
@ -41,6 +42,10 @@
}; };
}; };
}; };
xdg.portal = {
enable = true;
extraPortals = with pkgs; [xdg-desktop-portal-gtk];
};
programs = { programs = {
hyprland.enable = true; hyprland.enable = true;
thunar = { thunar = {