update + nogaps

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-04-22 14:21:17 +02:00
parent 819f0a8079
commit f6b0f2585c
4 changed files with 71 additions and 93 deletions

115
flake.lock generated
View File

@@ -4,20 +4,14 @@
"inputs": {
"hyprland": [
"hyprland"
],
"hyprlandPlugins": "hyprlandPlugins",
"nixpkgs": [
"Hyprspace",
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1713240951,
"narHash": "sha256-Nvbn1baUNN7AQOA1hHunUHuFziF0dErqaTlfxr9NNwo=",
"lastModified": 1713738762,
"narHash": "sha256-wXMqOQosjblsdV3x0DzpH7qSBUs5hT5Ca6eZ2Xp8TOA=",
"owner": "KZDKM",
"repo": "Hyprspace",
"rev": "954eda50aca5ef986c557f3b515c4321fd3c7fd8",
"rev": "de3b1ccbf30498b6fcd42b36418e33a2c8c1405a",
"type": "github"
},
"original": {
@@ -63,11 +57,11 @@
]
},
"locked": {
"lastModified": 1713214463,
"narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=",
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"type": "github"
},
"original": {
@@ -81,17 +75,18 @@
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1713283263,
"narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=",
"lastModified": 1713778289,
"narHash": "sha256-h3ufswObZ8qUxQewTc5L173ILfV6JBQ+IaN1aN9RPjY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759",
"rev": "e1644e91ead7cdef5d08bfe6a579c4478a816a8e",
"type": "github"
},
"original": {
@@ -112,11 +107,11 @@
]
},
"locked": {
"lastModified": 1713283897,
"narHash": "sha256-/0OPK/bDr8/Lf7r8kzDD/yP1kySbJ8gPmV3CdUbVTFM=",
"lastModified": 1713607544,
"narHash": "sha256-nbqQmhvYbDVC/5YiZLSGj5r14cOk2k6TGPpP2TtCfhI=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "00d147d7f6ad2ecfbf75efe4a8402723c72edd98",
"rev": "9971fec974a9d94a2a1b1d68d5ada5fc59fec053",
"type": "github"
},
"original": {
@@ -150,33 +145,6 @@
"type": "github"
}
},
"hyprlandPlugins": {
"inputs": {
"hyprland": [
"Hyprspace",
"hyprland"
],
"systems": [
"Hyprspace",
"hyprlandPlugins",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1712836056,
"narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-plugins",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"nixpkgs": [
@@ -202,13 +170,38 @@
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1713730424,
"narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"type": "github"
},
"original": {
@@ -220,11 +213,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"type": "github"
},
"original": {
@@ -235,11 +228,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713145326,
"narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=",
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"type": "github"
},
"original": {
@@ -276,17 +269,17 @@
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1713124002,
"narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=",
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "611a4f24cd2384378f6e500253983107c6656c64",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "611a4f24cd2384378f6e500253983107c6656c64",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
}
},
@@ -310,11 +303,11 @@
]
},
"locked": {
"lastModified": 1713214484,
"narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=",
"lastModified": 1713724432,
"narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61",
"rev": "9ace6f969ce495185df34cc6254fb9d297765478",
"type": "github"
},
"original": {

View File

@@ -69,9 +69,9 @@
rice = rec {
lib = import ./nxlib/ricelib.nix { lib = nixpkgs.lib; };
transparency = 0.9;
rounding = 5;
gap-size = 10;
transparency = 0.8;
rounding = 0;
gap-size = 0;
border-width = 2;
color = rec {
background = "#000000";

View File

@@ -55,7 +55,7 @@ in
xwayland.enable = true;
systemd.enable = true;
plugins = [
inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
# inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
# inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
# inputs.hycov.packages.${pkgs.system}.hycov
inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
@@ -347,7 +347,7 @@ in
#bind = SUPER, TAB, hycov:toggleoverview
"SUPER, TAB, overview:toggle"
"SUPER SHIFT, TAB, hyprexpo:expo, toggle"
# "SUPER SHIFT, TAB, hyprexpo:expo, toggle"
"ALT, TAB, focuscurrentorlast"
"SUPER, Q, killactive"
"SUPER, W, exec, waybar_mode set '󰈹 '"
@@ -460,21 +460,6 @@ in
bindl = [
# ",switch:on:Lid Switch, exec, hyprlock &"
];
# plugin = {
# hyprexpo = {
# columns = 1;
# gap_size = rice.gap-size;
# bg_col = "rgb(ff1111)";
# workspace_method = "center current"; # [center/first] [workspace] e.g. first 1 or center m+1
# enable_gesture = true; # laptop touchpad, 4 fingers
# gesture_distance = "300"; # how far is the "max"
# gesture_positive = true; # positive = swipe down. Negative = swipe up.
# };
# };
};
@@ -771,18 +756,18 @@ in
plugin {
hyprexpo {
columns = 5
gap_size = ${builtins.toString rice.gap-size}
bg_col = rgb(${rice.lib.nohash rice.color.background})
workspace_method = first 10 # [center/first] [workspace] e.g. first 1 or center m+1
# plugin {
# hyprexpo {
# columns = 5
# gap_size = ${builtins.toString rice.gap-size}
# bg_col = rgb(${rice.lib.nohash rice.color.background})
# workspace_method = first 10 # [center/first] [workspace] e.g. first 1 or center m+1
enable_gesture = false # laptop touchpad, 4 fingers
gesture_distance = 300 # how far is the "max"
gesture_positive = true # positive = swipe down. Negative = swipe up.
}
}
# enable_gesture = false # laptop touchpad, 4 fingers
# gesture_distance = 300 # how far is the "max"
# gesture_positive = true # positive = swipe down. Negative = swipe up.
# }
# }
plugin {

View File

@@ -177,7 +177,7 @@ in
transition-duration: 0.5s;
padding: 7px 10px;
padding-top: 0.1em;
border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
/* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue}); */
/* margin: ${builtins.toString rice.gap-size}px; */
border-radius: ${builtins.toString rice.rounding}px;