feat: hypr changes, notifications, power button, vpn
This commit is contained in:
@@ -8,6 +8,7 @@ in
|
|||||||
(import ./hyprland/wallpaper.nix { inherit pkgs scripts; })
|
(import ./hyprland/wallpaper.nix { inherit pkgs scripts; })
|
||||||
(import ./hyprland/hyprlock.nix { inherit pkgs scripts; })
|
(import ./hyprland/hyprlock.nix { inherit pkgs scripts; })
|
||||||
(import ./hyprland/hypridle.nix { inherit pkgs scripts; })
|
(import ./hyprland/hypridle.nix { inherit pkgs scripts; })
|
||||||
|
./hyprland/notifications.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file.".config/waybar/config.jsonc".source = ./hyprland/waybar/config.jsonc;
|
home.file.".config/waybar/config.jsonc".source = ./hyprland/waybar/config.jsonc;
|
||||||
|
|||||||
@@ -55,13 +55,18 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
"XCURSOR_SIZE,20"
|
"HYPRCURSOR_THEME,macOS"
|
||||||
"XCURSOR_THEME,macOS"
|
"HYPRCURSOR_SIZE,20"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# env = [
|
||||||
|
# "XCURSOR_SIZE,20"
|
||||||
|
# "XCURSOR_THEME,macOS"
|
||||||
|
# ];
|
||||||
|
|
||||||
general = {
|
general = {
|
||||||
gaps_in = 5;
|
gaps_in = 0;
|
||||||
gaps_out = 20;
|
gaps_out = 0;
|
||||||
|
|
||||||
border_size = 2;
|
border_size = 2;
|
||||||
|
|
||||||
@@ -222,8 +227,8 @@
|
|||||||
"$mainMod SHIFT, K, swapwindow, u"
|
"$mainMod SHIFT, K, swapwindow, u"
|
||||||
"$mainMod SHIFT, J, swapwindow, d"
|
"$mainMod SHIFT, J, swapwindow, d"
|
||||||
|
|
||||||
"$mainMod ALT, H, resizeactive, -40 0"
|
# "$mainMod ALT, H, resizeactive, -40 0"
|
||||||
"$mainMod ALT, L, resizeactive, 40 0"
|
# "$mainMod ALT, L, resizeactive, 40 0"
|
||||||
|
|
||||||
# Switch workspaces with mainMod + [0-9]
|
# Switch workspaces with mainMod + [0-9]
|
||||||
"$mainMod, 1, workspace, 1"
|
"$mainMod, 1, workspace, 1"
|
||||||
@@ -256,8 +261,15 @@
|
|||||||
# Scroll through existing workspaces with mainMod + scroll
|
# Scroll through existing workspaces with mainMod + scroll
|
||||||
# "$mainMod, mouse_down, workspace, e+1"
|
# "$mainMod, mouse_down, workspace, e+1"
|
||||||
# "$mainMod, mouse_up, workspace, e-1"
|
# "$mainMod, mouse_up, workspace, e-1"
|
||||||
|
|
||||||
|
", Prior, exec, ${pkgs.ydotool}/bin/ydotool click --next-delay 0 0x40"
|
||||||
|
", Next, exec, ${pkgs.ydotool}/bin/ydotool click --next-delay 0 0x41"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
bindr = [
|
||||||
|
", Prior, exec, ${pkgs.ydotool}/bin/ydotool click --next-delay 0 0x80"
|
||||||
|
", Next, exec, ${pkgs.ydotool}/bin/ydotool click --next-delay 0 0x81"
|
||||||
|
];
|
||||||
|
|
||||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||||
bindm = [
|
bindm = [
|
||||||
@@ -295,6 +307,16 @@
|
|||||||
"$mainMod, X, Universal cut, sendshortcut, CTRL, X,"
|
"$mainMod, X, Universal cut, sendshortcut, CTRL, X,"
|
||||||
"$mainMod, A, Universal select all, sendshortcut, CTRL, A,"
|
"$mainMod, A, Universal select all, sendshortcut, CTRL, A,"
|
||||||
"$mainMod, T, Universal new tab, sendshortcut, CTRL, T,"
|
"$mainMod, T, Universal new tab, sendshortcut, CTRL, T,"
|
||||||
|
|
||||||
|
"$mainMod ALT, H, Universal left, sendshortcut, , Left,"
|
||||||
|
"$mainMod ALT, J, Universal down, sendshortcut, , Down,"
|
||||||
|
"$mainMod ALT, K, Universal up, sendshortcut, , Up,"
|
||||||
|
"$mainMod ALT, L, Universal right, sendshortcut, , Right,"
|
||||||
|
|
||||||
|
"$mainMod SHIFT ALT, H, Universal left, sendshortcut, SHIFT, Left,"
|
||||||
|
"$mainMod SHIFT ALT, J, Universal down, sendshortcut, SHIFT, Down,"
|
||||||
|
"$mainMod SHIFT ALT, K, Universal up, sendshortcut, SHIFT, Up,"
|
||||||
|
"$mainMod SHIFT ALT, L, Universal right, sendshortcut, SHIFT, Right,"
|
||||||
];
|
];
|
||||||
|
|
||||||
windowrule = [
|
windowrule = [
|
||||||
|
|||||||
@@ -17,12 +17,12 @@
|
|||||||
background = {
|
background = {
|
||||||
monitor = "";
|
monitor = "";
|
||||||
color = "$color";
|
color = "$color";
|
||||||
path = "~/Downloads/wallpaper.png";
|
# path = "~/Downloads/wallpaper.png";
|
||||||
blur_passes = 3;
|
blur_passes = 3;
|
||||||
};
|
};
|
||||||
|
|
||||||
animations = {
|
animations = {
|
||||||
enabled = false;
|
enabled = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
input-field = {
|
input-field = {
|
||||||
|
|||||||
31
home/common/optional/desktop/hyprland/notifications.nix
Normal file
31
home/common/optional/desktop/hyprland/notifications.nix
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
{
|
||||||
|
services.swaync = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
notification-window-width = 350;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Taken from:
|
||||||
|
# https://github.com/ErikReider/SwayNotificationCenter/blob/2083415ee6441acc272f46f8a43ebccae215f69a/data/style/style.scss#L4
|
||||||
|
style = ''
|
||||||
|
:root {
|
||||||
|
--cc-bg: rgba(46, 46, 46, 0.7);
|
||||||
|
|
||||||
|
--noti-border-color: rgba(255, 255, 255, 0.15);
|
||||||
|
--noti-bg: 48, 48, 48;
|
||||||
|
--noti-bg-alpha: 1;
|
||||||
|
|
||||||
|
--border-radius: 0;
|
||||||
|
|
||||||
|
--font-size-body: 13px;
|
||||||
|
--font-size-summary: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-button {
|
||||||
|
min-width: 18px;
|
||||||
|
min-height: 18px;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -12,4 +12,6 @@
|
|||||||
withUWSM = true;
|
withUWSM = true;
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.ydotool.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,8 +39,14 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.upower.enable = true;
|
services.upower.enable = true;
|
||||||
|
services.logind.settings.Login.HandlePowerKey = "ignore";
|
||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
plugins = with pkgs; [
|
||||||
|
networkmanager-openconnect
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
users.users.max = {
|
users.users.max = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
hashedPasswordFile = config.sops.secrets.max-password.path;
|
hashedPasswordFile = config.sops.secrets.max-password.path;
|
||||||
extraGroups = [ "wheel" "networkmanager" "video" "kvm" "docker" ];
|
extraGroups = [ "wheel" "networkmanager" "video" "kvm" "docker" "ydotool" ];
|
||||||
packages = with pkgs; [ tree ];
|
packages = with pkgs; [ tree ];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|||||||
2
secrets
2
secrets
Submodule secrets updated: 7bf9979dac...b5647c0094
Reference in New Issue
Block a user