[Fix] Hyprland config
This commit is contained in:
parent
9de92b3c62
commit
b643f80dbb
30
flake.lock
30
flake.lock
|
|
@ -132,11 +132,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765980955,
|
"lastModified": 1767606757,
|
||||||
"narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
|
"narHash": "sha256-lCl9QyHHHG/lKkpZu9nhJ5ri30FUD66VWNMJp167wPY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
|
"rev": "c4eabb884b01366f25c3f80823b12dd595ed603a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -184,11 +184,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765779637,
|
"lastModified": 1767379071,
|
||||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -200,11 +200,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765779637,
|
"lastModified": 1767379071,
|
||||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -252,11 +252,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766139198,
|
"lastModified": 1767602452,
|
||||||
"narHash": "sha256-hYSbijPD3nvKZ9LObykgOO1C0s0/IM7Zv6BtTXB1F9g=",
|
"narHash": "sha256-dtAvNihXmUiFC4npKNByp7UwW8hILrCzcc0ZnzejWgw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "5a370962ea203522236dade2aed4094069cb331d",
|
"rev": "af0cd55eba4021bf93701eeab00e86018fb7aaf5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -299,11 +299,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765982567,
|
"lastModified": 1767587590,
|
||||||
"narHash": "sha256-lii6QTyRYIaQk9eDsvwzSZ1ZlICQoP/sIAWDGlXVpbI=",
|
"narHash": "sha256-2OVoKCCZ4sCEZJ03LOaNJ9tDVIHCrxyk5/ME/UtqiC0=",
|
||||||
"owner": "vicinaehq",
|
"owner": "vicinaehq",
|
||||||
"repo": "vicinae",
|
"repo": "vicinae",
|
||||||
"rev": "69f8a116929b9bc5f4b0e3b822a148ae657bb9c6",
|
"rev": "5ea9b53a5febfc63ee6fc5010500ccaac974a6bf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,9 @@ in
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# jetbrains.pycharm-professional
|
# jetbrains.pycharm-professional
|
||||||
rclone
|
rclone
|
||||||
|
opencode
|
||||||
zed-editor
|
zed-editor
|
||||||
|
google-cloud-sdk
|
||||||
distrobox
|
distrobox
|
||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
moonlight-qt
|
moonlight-qt
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,12 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||||
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
|
||||||
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
||||||
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||||
terminal-name = "foot";
|
terminal-name = "foot";
|
||||||
terminal = "${pkgs.foot}/bin/footclient";
|
terminal = "${pkgs.foot}/bin/footclient";
|
||||||
jq = "${pkgs.jq}/bin/jq";
|
jq = "${pkgs.jq}/bin/jq";
|
||||||
# workspace_command_prefix = "split-";
|
|
||||||
# hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces ];
|
|
||||||
|
|
||||||
# workspace_command_prefix = "split:";
|
|
||||||
# hyprland_plugins = [ pkgs.hyprlandPlugins.hyprsplit ];
|
|
||||||
|
|
||||||
# Disable split-monitor-workspaces
|
# Disable split-monitor-workspaces
|
||||||
workspace_command_prefix = "";
|
workspace_command_prefix = "";
|
||||||
|
|
@ -73,10 +67,10 @@ in {
|
||||||
settings = {
|
settings = {
|
||||||
ipc = "on";
|
ipc = "on";
|
||||||
splash = false;
|
splash = false;
|
||||||
preload = [ "${./files/wallpaper.png}" ];
|
wallpaper = {
|
||||||
wallpaper = [
|
path = "${./files/wallpaper.png}";
|
||||||
",${./files/wallpaper.png}"
|
monitor = "";
|
||||||
];
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -133,22 +127,39 @@ in {
|
||||||
"WLR_RENDERER_ALLOW_SOFTWARE,1"
|
"WLR_RENDERER_ALLOW_SOFTWARE,1"
|
||||||
];
|
];
|
||||||
debug = { disable_logs = false; };
|
debug = { disable_logs = false; };
|
||||||
|
|
||||||
|
# UPDATED: New Window Rule Syntax (0.53.0)
|
||||||
windowrule = [
|
windowrule = [
|
||||||
"float, title:^(rofi)(.*)$"
|
"float on, match:title ^(rofi)(.*)$"
|
||||||
"center, title:^(rofi)(.*)$"
|
"center on, match:title ^(rofi)(.*)$"
|
||||||
"noborder, title:^(rofi)(.*)$"
|
"border_size 0, match:title ^(rofi)(.*)$" # 'noborder' is replaced by border_size 0
|
||||||
"stayfocused, title:^()$,class:^(steam)$"
|
|
||||||
"minsize 1 1, title:^()$,class:^(steam)$"
|
# Combined matches (replaces old multi-rule logic)
|
||||||
"stayfocused, title:^()$,class:^(steam)$"
|
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||||
"workspace 8, class:thunderbird"
|
"min_size 1 1, match:title ^()$, match:class ^(steam)$"
|
||||||
"workspace 9, class:spotify"
|
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||||
"workspace 10, class:Slack"
|
|
||||||
"bordersize 0, floating:0, onworkspace:w[tv1]"
|
"workspace 8, match:class thunderbird"
|
||||||
"rounding 0, floating:0, onworkspace:w[tv1]"
|
"workspace 9, match:class spotify"
|
||||||
"bordersize 0, floating:0, onworkspace:f[1]"
|
"workspace 10, match:class Slack"
|
||||||
"rounding 0, floating:0, onworkspace:f[1]"
|
|
||||||
|
# Windowrulev2-style logic updated to new prop syntax
|
||||||
|
"border_size 0, match:float 0, match:workspace w[tv1]"
|
||||||
|
"rounding 0, match:float 0, match:workspace w[tv1]"
|
||||||
|
"border_size 0, match:float 0, match:workspace f[1]"
|
||||||
|
"rounding 0, match:float 0, match:workspace f[1]"
|
||||||
];
|
];
|
||||||
layerrule = [ "noanim,ags_bar_0" "noanim,selection" "blur,vicinae" "ignorealpha 0, vicinae" "noanim, vicinae"];
|
|
||||||
|
# UPDATED: New Layer Rule Syntax (0.53.0)
|
||||||
|
# Syntax: effect value, match:namespace regex
|
||||||
|
layerrule = [
|
||||||
|
"no_anim on, match:namespace ags_bar_0"
|
||||||
|
"no_anim on, match:namespace selection"
|
||||||
|
"blur on, match:namespace vicinae"
|
||||||
|
"ignore_alpha 0, match:namespace vicinae"
|
||||||
|
"no_anim on, match:namespace vicinae"
|
||||||
|
];
|
||||||
|
|
||||||
general = {
|
general = {
|
||||||
gaps_in = 1;
|
gaps_in = 1;
|
||||||
gaps_out = pkgs.lib.mkDefault 5;
|
gaps_out = pkgs.lib.mkDefault 5;
|
||||||
|
|
@ -160,14 +171,14 @@ in {
|
||||||
input = {
|
input = {
|
||||||
kb_layout = "us";
|
kb_layout = "us";
|
||||||
follow_mouse = 1;
|
follow_mouse = 1;
|
||||||
kb_options = pkgs.lib.mkDefault "compose:rctrl, shift:both_capslock, caps:ctrl_modifier";
|
kb_options = pkgs.lib.mkDefault "compose:rctrl, caps:ctrl_modifier";
|
||||||
numlock_by_default = true;
|
numlock_by_default = true;
|
||||||
};
|
};
|
||||||
binds = { scroll_event_delay = 1; };
|
binds = { scroll_event_delay = 1; };
|
||||||
xwayland = { force_zero_scaling = true; };
|
xwayland = { force_zero_scaling = true; };
|
||||||
misc = {
|
misc = {
|
||||||
disable_hyprland_logo = 1;
|
disable_hyprland_logo = 1;
|
||||||
enable_anr_dialog = false;
|
# Removed 'enable_anr_dialog' (deprecated/removed in recent versions)
|
||||||
};
|
};
|
||||||
decoration = {
|
decoration = {
|
||||||
rounding = 1;
|
rounding = 1;
|
||||||
|
|
@ -189,6 +200,7 @@ in {
|
||||||
preserve_split = "yes";
|
preserve_split = "yes";
|
||||||
force_split = 2;
|
force_split = 2;
|
||||||
};
|
};
|
||||||
|
|
||||||
gesture = [
|
gesture = [
|
||||||
"3, horizontal, workspace"
|
"3, horizontal, workspace"
|
||||||
];
|
];
|
||||||
|
|
@ -242,8 +254,8 @@ in {
|
||||||
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
||||||
",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
||||||
",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
||||||
",mouse_right, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
|
# ",mouse:273, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
|
||||||
",mouse_left, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
|
# ",mouse:272, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
|
||||||
",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
",XF86AudioNext, exec, ${playerctl} next"
|
",XF86AudioNext, exec, ${playerctl} next"
|
||||||
",XF86AudioPrev, exec, ${playerctl} previous"
|
",XF86AudioPrev, exec, ${playerctl} previous"
|
||||||
|
|
@ -274,7 +286,6 @@ in {
|
||||||
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
||||||
] ++ (
|
] ++ (
|
||||||
# workspaces
|
# workspaces
|
||||||
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
|
|
||||||
builtins.concatLists (builtins.genList (x:
|
builtins.concatLists (builtins.genList (x:
|
||||||
let
|
let
|
||||||
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableDefaultConfig = false;
|
enableDefaultConfig = false;
|
||||||
includes = [ "gpulab_hosts_config" ];
|
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"*" = {
|
"*" = {
|
||||||
host = "*";
|
host = "*";
|
||||||
|
|
@ -79,6 +78,13 @@
|
||||||
user = "server";
|
user = "server";
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
};
|
};
|
||||||
|
gcp = {
|
||||||
|
host = "gcp";
|
||||||
|
hostname = "34.126.140.76";
|
||||||
|
port = 22;
|
||||||
|
user = "user";
|
||||||
|
forwardAgent = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,13 @@
|
||||||
imports = [ inputs.vicinae.homeManagerModules.default ];
|
imports = [ inputs.vicinae.homeManagerModules.default ];
|
||||||
|
|
||||||
services.vicinae = {
|
services.vicinae = {
|
||||||
|
enable = true;
|
||||||
|
systemd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
|
environment = {
|
||||||
|
QT_SCALE_FACTOR="1.5";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue