Skip to content

Commit 11643d1

Browse files
TophC7TophC7
committed
chore: fix all current deprecation warnings
1 parent 426ffa6 commit 11643d1

File tree

8 files changed

+426
-407
lines changed

8 files changed

+426
-407
lines changed

‎home/global/common/desktop/niri/binds.nix‎

Lines changed: 187 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -12,189 +12,193 @@
1212
mod-key = "Super";
1313
mod-key-nested = "Alt";
1414
};
15-
binds = lib.mkDefault {
16-
# Application launchers
17-
"Mod+T".action.spawn = lib.getExe pkgs.ghostty;
18-
"Mod+E".action.spawn = lib.getExe pkgs.vscode;
19-
"Mod+W".action.spawn = lib.getExe inputs.zen-browser.packages.${pkgs.system}.default;
20-
"Mod+F".action.spawn = lib.getExe pkgs.nautilus;
21-
22-
"Mod+Space".action.spawn = [
23-
"vicinae"
24-
"toggle"
25-
]; # Application launcher
26-
27-
"Mod+A".action.spawn = [
28-
"dms"
29-
"ipc"
30-
"notifications"
31-
"toggle"
32-
]; # Notification center
33-
34-
"Mod+Comma".action.spawn = [
35-
"dms"
36-
"ipc"
37-
"settings"
38-
"toggle"
39-
]; # Settings
40-
41-
"Mod+M".action.spawn = [
42-
"dms"
43-
"ipc"
44-
"processlist"
45-
"toggle"
46-
]; # Process list (system monitor)
47-
48-
"Mod+V".action.spawn = [
49-
"vicinae"
50-
"vicinae://extensions/vicinae/clipboard/history"
51-
]; # Clipboard manager
52-
53-
"Mod+Tab".action.spawn = [
54-
"vicinae"
55-
"vicinae://extensions/vicinae/wm/switch-windows"
56-
]; # Window switcher
57-
58-
"Mod+X".action.spawn = [
59-
"dms"
60-
"ipc"
61-
"powermenu"
62-
"toggle"
63-
]; # Power menu
64-
65-
"Mod+P".action.spawn = [
66-
"dms"
67-
"ipc"
68-
"notepad"
69-
"toggle"
70-
]; # Notepad
71-
72-
"Mod+N".action.spawn = [
73-
"dms"
74-
"ipc"
75-
"night"
76-
"toggle"
77-
]; # Night mode
78-
79-
# System controls
80-
"Ctrl+Alt+Delete".action.quit = { }; # Exit Niri
81-
"Ctrl+Alt+Escape".action.spawn = [
82-
"loginctl"
83-
"terminate-user"
84-
"$USER"
85-
];
86-
87-
"Mod+L".action.spawn = [
88-
"dms"
89-
"ipc"
90-
"lock"
91-
]; # DMS lock screen (replaces swaylock)
92-
93-
"Mod+Shift+A".action.toggle-overview = { };
94-
"Mod+F1".action.show-hotkey-overlay = { };
95-
96-
# Window/Column management
97-
"Mod+Q".action.close-window = { };
98-
"Mod+C".action.center-column = { };
99-
"Mod+D".action.toggle-window-floating = { }; # Kept (DMS notepad moved to Mod+Shift+P)
100-
"Mod+S".action.toggle-column-tabbed-display = { }; # Kept (DMS settings moved to Mod+Comma)
101-
102-
# Window focus (Arrow keys)
103-
"Mod+Left".action.focus-column-or-monitor-left = { };
104-
"Mod+Right".action.focus-column-or-monitor-right = { };
105-
"Mod+Up".action.focus-window-or-workspace-up = { };
106-
"Mod+Down".action.focus-window-or-workspace-down = { };
107-
108-
# Window movement
109-
"Mod+Shift+Left".action.consume-or-expel-window-left = { };
110-
"Mod+Shift+Right".action.consume-or-expel-window-right = { };
111-
"Mod+Shift+Up".action.move-window-up = { };
112-
"Mod+Shift+Down".action.move-window-down = { };
113-
114-
# Monitor/Workspace movement
115-
"Mod+Ctrl+Left".action.move-column-to-monitor-left = { };
116-
"Mod+Ctrl+Right".action.move-column-to-monitor-right = { };
117-
"Mod+Ctrl+Up".action.move-column-to-workspace-up = { };
118-
"Mod+Ctrl+Down".action.move-column-to-workspace-down = { };
119-
120-
# Window sizing
121-
"Mod+Alt+Left".action.switch-preset-column-width-back = { };
122-
"Mod+Alt+Right".action.switch-preset-column-width = { };
123-
"Mod+Alt+Up".action.set-window-height = "+10%";
124-
"Mod+Alt+Down".action.set-window-height = "-10%";
125-
"Mod+Alt+F".action.fullscreen-window = { };
126-
127-
# Screenshots
128-
"Print".action.screenshot = { };
129-
"Shift+Print".action.screenshot-screen = { };
130-
"Super+Print".action.screenshot-window = { };
131-
132-
# Media controls (DMS)
133-
"XF86AudioRaiseVolume".action.spawn = [
134-
"dms"
135-
"ipc"
136-
"audio"
137-
"increment"
138-
"3"
139-
];
140-
141-
"XF86AudioLowerVolume".action.spawn = [
142-
"dms"
143-
"ipc"
144-
"audio"
145-
"decrement"
146-
"3"
147-
];
148-
149-
"XF86AudioMute".action.spawn = [
150-
"dms"
151-
"ipc"
152-
"audio"
153-
"mute"
154-
];
155-
156-
"XF86AudioMicMute".action.spawn = [
157-
"dms"
158-
"ipc"
159-
"audio"
160-
"micmute"
161-
];
162-
163-
# Media player controlss
164-
"XF86AudioPlay".action.spawn = [
165-
"${pkgs.playerctl}/bin/playerctl"
166-
"play-pause"
167-
];
168-
169-
"XF86AudioNext".action.spawn = [
170-
"${pkgs.playerctl}/bin/playerctl"
171-
"next"
172-
];
173-
174-
"XF86AudioPrev".action.spawn = [
175-
"${pkgs.playerctl}/bin/playerctl"
176-
"previous"
177-
];
178-
179-
# Brightness controls (DMS)
180-
"XF86MonBrightnessUp".action.spawn = [
181-
"dms"
182-
"ipc"
183-
"brightness"
184-
"increment"
185-
"5"
186-
""
187-
];
188-
189-
"XF86MonBrightnessDown".action.spawn = [
190-
"dms"
191-
"ipc"
192-
"brightness"
193-
"decrement"
194-
"5"
195-
""
196-
];
197-
};
15+
binds =
16+
let
17+
zen = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
18+
in
19+
lib.mkDefault {
20+
# Application launchers
21+
"Mod+T".action.spawn = lib.getExe pkgs.ghostty;
22+
"Mod+E".action.spawn = lib.getExe pkgs.vscode;
23+
"Mod+W".action.spawn = lib.getExe zen;
24+
"Mod+F".action.spawn = lib.getExe pkgs.nautilus;
25+
26+
"Mod+Space".action.spawn = [
27+
"vicinae"
28+
"toggle"
29+
]; # Application launcher
30+
31+
"Mod+A".action.spawn = [
32+
"dms"
33+
"ipc"
34+
"notifications"
35+
"toggle"
36+
]; # Notification center
37+
38+
"Mod+Comma".action.spawn = [
39+
"dms"
40+
"ipc"
41+
"settings"
42+
"toggle"
43+
]; # Settings
44+
45+
"Mod+M".action.spawn = [
46+
"dms"
47+
"ipc"
48+
"processlist"
49+
"toggle"
50+
]; # Process list (system monitor)
51+
52+
"Mod+V".action.spawn = [
53+
"vicinae"
54+
"vicinae://extensions/vicinae/clipboard/history"
55+
]; # Clipboard manager
56+
57+
"Mod+Tab".action.spawn = [
58+
"vicinae"
59+
"vicinae://extensions/vicinae/wm/switch-windows"
60+
]; # Window switcher
61+
62+
"Mod+X".action.spawn = [
63+
"dms"
64+
"ipc"
65+
"powermenu"
66+
"toggle"
67+
]; # Power menu
68+
69+
"Mod+P".action.spawn = [
70+
"dms"
71+
"ipc"
72+
"notepad"
73+
"toggle"
74+
]; # Notepad
75+
76+
"Mod+N".action.spawn = [
77+
"dms"
78+
"ipc"
79+
"night"
80+
"toggle"
81+
]; # Night mode
82+
83+
# System controls
84+
"Ctrl+Alt+Delete".action.quit = { }; # Exit Niri
85+
"Ctrl+Alt+Escape".action.spawn = [
86+
"loginctl"
87+
"terminate-user"
88+
"$USER"
89+
];
90+
91+
"Mod+L".action.spawn = [
92+
"dms"
93+
"ipc"
94+
"lock"
95+
]; # DMS lock screen (replaces swaylock)
96+
97+
"Mod+Shift+A".action.toggle-overview = { };
98+
"Mod+F1".action.show-hotkey-overlay = { };
99+
100+
# Window/Column management
101+
"Mod+Q".action.close-window = { };
102+
"Mod+C".action.center-column = { };
103+
"Mod+D".action.toggle-window-floating = { }; # Kept (DMS notepad moved to Mod+Shift+P)
104+
"Mod+S".action.toggle-column-tabbed-display = { }; # Kept (DMS settings moved to Mod+Comma)
105+
106+
# Window focus (Arrow keys)
107+
"Mod+Left".action.focus-column-or-monitor-left = { };
108+
"Mod+Right".action.focus-column-or-monitor-right = { };
109+
"Mod+Up".action.focus-window-or-workspace-up = { };
110+
"Mod+Down".action.focus-window-or-workspace-down = { };
111+
112+
# Window movement
113+
"Mod+Shift+Left".action.consume-or-expel-window-left = { };
114+
"Mod+Shift+Right".action.consume-or-expel-window-right = { };
115+
"Mod+Shift+Up".action.move-window-up = { };
116+
"Mod+Shift+Down".action.move-window-down = { };
117+
118+
# Monitor/Workspace movement
119+
"Mod+Ctrl+Left".action.move-column-to-monitor-left = { };
120+
"Mod+Ctrl+Right".action.move-column-to-monitor-right = { };
121+
"Mod+Ctrl+Up".action.move-column-to-workspace-up = { };
122+
"Mod+Ctrl+Down".action.move-column-to-workspace-down = { };
123+
124+
# Window sizing
125+
"Mod+Alt+Left".action.switch-preset-column-width-back = { };
126+
"Mod+Alt+Right".action.switch-preset-column-width = { };
127+
"Mod+Alt+Up".action.set-window-height = "+10%";
128+
"Mod+Alt+Down".action.set-window-height = "-10%";
129+
"Mod+Alt+F".action.fullscreen-window = { };
130+
131+
# Screenshots
132+
"Print".action.screenshot = { };
133+
"Shift+Print".action.screenshot-screen = { };
134+
"Super+Print".action.screenshot-window = { };
135+
136+
# Media controls (DMS)
137+
"XF86AudioRaiseVolume".action.spawn = [
138+
"dms"
139+
"ipc"
140+
"audio"
141+
"increment"
142+
"3"
143+
];
144+
145+
"XF86AudioLowerVolume".action.spawn = [
146+
"dms"
147+
"ipc"
148+
"audio"
149+
"decrement"
150+
"3"
151+
];
152+
153+
"XF86AudioMute".action.spawn = [
154+
"dms"
155+
"ipc"
156+
"audio"
157+
"mute"
158+
];
159+
160+
"XF86AudioMicMute".action.spawn = [
161+
"dms"
162+
"ipc"
163+
"audio"
164+
"micmute"
165+
];
166+
167+
# Media player controlss
168+
"XF86AudioPlay".action.spawn = [
169+
"${pkgs.playerctl}/bin/playerctl"
170+
"play-pause"
171+
];
172+
173+
"XF86AudioNext".action.spawn = [
174+
"${pkgs.playerctl}/bin/playerctl"
175+
"next"
176+
];
177+
178+
"XF86AudioPrev".action.spawn = [
179+
"${pkgs.playerctl}/bin/playerctl"
180+
"previous"
181+
];
182+
183+
# Brightness controls (DMS)
184+
"XF86MonBrightnessUp".action.spawn = [
185+
"dms"
186+
"ipc"
187+
"brightness"
188+
"increment"
189+
"5"
190+
""
191+
];
192+
193+
"XF86MonBrightnessDown".action.spawn = [
194+
"dms"
195+
"ipc"
196+
"brightness"
197+
"decrement"
198+
"5"
199+
""
200+
];
201+
};
198202
};
199203
};
200204
}

‎home/global/common/desktop/niri/programs/dms.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ in
4141
# DankMaterialShell configuration
4242
programs.dankMaterialShell = {
4343
enable = true;
44-
quickshell.package = inputs.quickshell.packages.${pkgs.system}.default;
44+
quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
4545

4646
# Core features
4747
enableSystemMonitoring = true; # System monitoring widgets (dgop)

‎home/global/common/zen.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}:
77
{
88
home.packages = [
9-
inputs.zen-browser.packages.${pkgs.system}.default
9+
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
1010
];
1111

1212
xdg.mimeApps.defaultApplications = {

0 commit comments

Comments
 (0)