Skip to content

Commit ee4b996

Browse files
debugloopdebugloop
committed
last week updates
1 parent d55efb1 commit ee4b996

File tree

2 files changed

+50
-44
lines changed

2 files changed

+50
-44
lines changed

‎home/wayland/niri.nix‎

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
off
1212
}
1313
}
14+
spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite" ":42"
1415
input {
1516
keyboard {
1617
xkb {
@@ -56,6 +57,7 @@
5657
screenshot-path "~/pictures/screenshot-%d-%m-%Y-%T.png"
5758
prefer-no-csd
5859
layout {
60+
empty-workspace-above-first
5961
gaps 0
6062
struts {
6163
left 0
@@ -64,6 +66,7 @@
6466
bottom 0
6567
}
6668
focus-ring {
69+
off
6770
width 1
6871
active-color "#7e9cd800"
6972
inactive-color "#6a9589"
@@ -74,14 +77,15 @@
7477
inactive-color "#363646"
7578
}
7679
tab-indicator {
77-
gap -8.000000
80+
gap 0
81+
place-within-column
7882
width 5
79-
length total-proportion=0.100000
83+
length total-proportion=0.200000
8084
position "right"
81-
gaps-between-tabs 5
85+
gaps-between-tabs 10
8286
corner-radius 5
83-
active-color "#7e9cd888"
84-
inactive-color "#36364688"
87+
active-color "#7e9cd8ff"
88+
inactive-color "#363646ff"
8589
}
8690
insert-hint { color "#76946a88"; }
8791
default-column-width { proportion 0.333000; }
@@ -107,14 +111,14 @@
107111
Cancel { spawn "/nix/store/q0fc3igzic4j2qw6zqbszakkmhw9y0xn-swaylock-effects-1.7.0.0/bin/swaylock" "-f"; }
108112
Ctrl+Alt+Delete allow-inhibiting=false { quit; }
109113
Ctrl+Print { screenshot-window; }
110-
Mod+0 { focus-workspace "yellow"; }
111-
Mod+1 { focus-workspace "red"; }
112-
Mod+2 { focus-workspace "green"; }
113-
Mod+3 { focus-workspace "blue"; }
114-
Mod+4 { focus-workspace "orange"; }
115-
Mod+7 { focus-workspace "pink"; }
116-
Mod+8 { focus-workspace "cyan"; }
117-
Mod+9 { focus-workspace "purple"; }
114+
Mod+0 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"yellow\")' && niri msg action focus-workspace yellow || niri msg action focus-workspace 42 && niri msg action set-workspace-name yellow"; }
115+
Mod+1 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"red\")' && niri msg action focus-workspace red || niri msg action focus-workspace 42 && niri msg action set-workspace-name red"; }
116+
Mod+2 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"green\")' && niri msg action focus-workspace green || niri msg action focus-workspace 42 && niri msg action set-workspace-name green"; }
117+
Mod+3 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"blue\")' && niri msg action focus-workspace blue || niri msg action focus-workspace 42 && niri msg action set-workspace-name blue"; }
118+
Mod+4 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"orange\")' && niri msg action focus-workspace orange || niri msg action focus-workspace 42 && niri msg action set-workspace-name orange"; }
119+
Mod+7 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"pink\")' && niri msg action focus-workspace pink || niri msg action focus-workspace 42 && niri msg action set-workspace-name pink"; }
120+
Mod+8 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"cyan\")' && niri msg action focus-workspace cyan || niri msg action focus-workspace 42 && niri msg action set-workspace-name cyan"; }
121+
Mod+9 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"purple\")' && niri msg action focus-workspace purple || niri msg action focus-workspace 42 && niri msg action set-workspace-name purple"; }
118122
Mod+Backslash { spawn "/nix/store/q0fc3igzic4j2qw6zqbszakkmhw9y0xn-swaylock-effects-1.7.0.0/bin/swaylock" "-f"; }
119123
Mod+BracketLeft { focus-column-first; }
120124
Mod+BracketRight { focus-column-last; }
@@ -156,14 +160,14 @@
156160
Mod+Return { spawn "/nix/store/r8xiqydgjbxixvqa092ag18zmnvlnbyc-kitty-0.41.1/bin/kitty"; }
157161
Mod+S { set-dynamic-cast-window; }
158162
Mod+Semicolon { spawn "fish" "-c" "niri msg action focus-window --id (niri msg -j windows | jq -r '.[] | (.id|tostring) + \" \" + .app_id + \": \" + .title' | /nix/store/w1sm854ilhiw793nq64bgp6s0p416a6a-wofi-1.4.1/bin/wofi -di | cut -d' ' -f1)"; }
159-
Mod+Shift+0 { spawn "fish" "-c" "niri msg action move-window-to-workspace yellow"; }
160-
Mod+Shift+1 { spawn "fish" "-c" "niri msg action move-window-to-workspace red"; }
161-
Mod+Shift+2 { spawn "fish" "-c" "niri msg action move-window-to-workspace green"; }
162-
Mod+Shift+3 { spawn "fish" "-c" "niri msg action move-window-to-workspace blue"; }
163-
Mod+Shift+4 { spawn "fish" "-c" "niri msg action move-window-to-workspace orange"; }
164-
Mod+Shift+7 { spawn "fish" "-c" "niri msg action move-window-to-workspace pink"; }
165-
Mod+Shift+8 { spawn "fish" "-c" "niri msg action move-window-to-workspace cyan"; }
166-
Mod+Shift+9 { spawn "fish" "-c" "niri msg action move-window-to-workspace purple"; }
163+
Mod+Shift+0 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"yellow\")' && niri msg action move-window-to-workspace yellow || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name yellow"; }
164+
Mod+Shift+1 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"red\")' && niri msg action move-window-to-workspace red || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name red"; }
165+
Mod+Shift+2 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"green\")' && niri msg action move-window-to-workspace green || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name green"; }
166+
Mod+Shift+3 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"blue\")' && niri msg action move-window-to-workspace blue || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name blue"; }
167+
Mod+Shift+4 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"orange\")' && niri msg action move-window-to-workspace orange || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name orange"; }
168+
Mod+Shift+7 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"pink\")' && niri msg action move-window-to-workspace pink || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name pink"; }
169+
Mod+Shift+8 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"cyan\")' && niri msg action move-window-to-workspace cyan || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name cyan"; }
170+
Mod+Shift+9 { spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"purple\")' && niri msg action move-window-to-workspace purple || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name purple"; }
167171
Mod+Shift+BracketLeft { move-column-to-first; }
168172
Mod+Shift+BracketRight { move-column-to-last; }
169173
Mod+Shift+Equal { spawn "niri" "msg" "output" "eDP-1" "off"; }
@@ -289,7 +293,7 @@
289293
hotkey-overlay.skip-at-startup = true;
290294
prefer-no-csd = true;
291295
layout = {
292-
# empty-workspace-above-first = true;
296+
empty-workspace-above-first = true;
293297
gaps = 0;
294298
shadow = {
295299
enable = false;
@@ -327,13 +331,14 @@
327331
];
328332
tab-indicator = {
329333
position = "right";
330-
gap = -8.0;
334+
place-within-column = true;
335+
gap = 0;
331336
width = 5;
332337
gaps-between-tabs = 5;
333-
length.total-proportion = 0.1;
338+
length.total-proportion = 0.2;
334339
corner-radius = 5;
335-
active.color = "#${config.colors.blue}88";
336-
inactive.color = "#${config.colors.light_bg}88";
340+
active.color = "#${config.colors.blue}ff";
341+
inactive.color = "#${config.colors.light_bg}ff";
337342
};
338343
insert-hint.display.color = "#${config.colors.green}88";
339344
};
@@ -537,23 +542,24 @@
537542
"Mod+Ctrl+0".action = set-workspace-name "yellow";
538543
"Mod+Ctrl+Minus".action = unset-workspace-name;
539544
# TODO: flake support for these?
540-
"Mod+Shift+1".action = spawn "fish" "-c" "niri msg action move-window-to-workspace red";
541-
"Mod+Shift+2".action = spawn "fish" "-c" "niri msg action move-window-to-workspace green";
542-
"Mod+Shift+3".action = spawn "fish" "-c" "niri msg action move-window-to-workspace blue";
543-
"Mod+Shift+4".action = spawn "fish" "-c" "niri msg action move-window-to-workspace orange";
544-
"Mod+Shift+7".action = spawn "fish" "-c" "niri msg action move-window-to-workspace pink";
545-
"Mod+Shift+8".action = spawn "fish" "-c" "niri msg action move-window-to-workspace cyan";
546-
"Mod+Shift+9".action = spawn "fish" "-c" "niri msg action move-window-to-workspace purple";
547-
"Mod+Shift+0".action = spawn "fish" "-c" "niri msg action move-window-to-workspace yellow";
545+
"Mod+Shift+1".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"red\")' && niri msg action move-window-to-workspace red || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name red";
546+
"Mod+Shift+2".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"green\")' && niri msg action move-window-to-workspace green || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name green";
547+
"Mod+Shift+3".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"blue\")' && niri msg action move-window-to-workspace blue || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name blue";
548+
"Mod+Shift+4".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"orange\")' && niri msg action move-window-to-workspace orange || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name orange";
549+
"Mod+Shift+7".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"pink\")' && niri msg action move-window-to-workspace pink || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name pink";
550+
"Mod+Shift+8".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"cyan\")' && niri msg action move-window-to-workspace cyan || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name cyan";
551+
"Mod+Shift+9".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"purple\")' && niri msg action move-window-to-workspace purple || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name purple";
552+
"Mod+Shift+0".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"yellow\")' && niri msg action move-window-to-workspace yellow || niri msg action move-window-to-workspace 42 && niri msg action set-workspace-name yellow";
548553
"Mod+Shift+Minus".action = spawn "fish" "-c" "niri msg action move-window-to-workspace 42";
549-
"Mod+1".action = focus-workspace "red";
550-
"Mod+2".action = focus-workspace "green";
551-
"Mod+3".action = focus-workspace "blue";
552-
"Mod+4".action = focus-workspace "orange";
553-
"Mod+7".action = focus-workspace "pink";
554-
"Mod+8".action = focus-workspace "cyan";
555-
"Mod+9".action = focus-workspace "purple";
556-
"Mod+0".action = focus-workspace "yellow";
554+
# "Mod+1".action = focus-workspace "red";
555+
"Mod+1".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"red\")' && niri msg action focus-workspace red || niri msg action focus-workspace 42 && niri msg action set-workspace-name red";
556+
"Mod+2".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"green\")' && niri msg action focus-workspace green || niri msg action focus-workspace 42 && niri msg action set-workspace-name green";
557+
"Mod+3".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"blue\")' && niri msg action focus-workspace blue || niri msg action focus-workspace 42 && niri msg action set-workspace-name blue";
558+
"Mod+4".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"orange\")' && niri msg action focus-workspace orange || niri msg action focus-workspace 42 && niri msg action set-workspace-name orange";
559+
"Mod+7".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"pink\")' && niri msg action focus-workspace pink || niri msg action focus-workspace 42 && niri msg action set-workspace-name pink";
560+
"Mod+8".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"cyan\")' && niri msg action focus-workspace cyan || niri msg action focus-workspace 42 && niri msg action set-workspace-name cyan";
561+
"Mod+9".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"purple\")' && niri msg action focus-workspace purple || niri msg action focus-workspace 42 && niri msg action set-workspace-name purple";
562+
"Mod+0".action = spawn "fish" "-c" "niri msg -j workspaces | jq -er '.[]|select(.name==\"yellow\")' && niri msg action focus-workspace yellow || niri msg action focus-workspace 42 && niri msg action set-workspace-name yellow";
557563
"Mod+Minus".action = focus-workspace 42;
558564

559565
# # workspace addresses, 0 is last with window, minus is the empty workspace

‎home/wayland/waybar_new.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,11 @@
230230
231231
/* workspaces */
232232
#workspaces {
233-
padding: 0em 0em 12em 0em;
233+
padding: 0.5em 0em;
234234
}
235235
#workspaces button {
236236
color: inherit; /* needed for some reason */
237-
padding: 0.5em 0.5em;
237+
padding: 0.5em;
238238
}
239239
240240
#workspaces button.visible {

0 commit comments

Comments
 (0)