Skip to content

Commit c625748

Browse files
DataEraserCDataEraserC
committed
Merge commit '850a7b2c43966ace4b6c28237dbedbcfdae657a1'
2 parents 581ca92 + 850a7b2 commit c625748

6 files changed

Lines changed: 53 additions & 24 deletions

File tree

‎home/linux/gui/niri/conf/config.kdl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ include "./windowrules.kdl"
99
include "./niri-hardware.kdl"
1010
include "./noctalia-shell.kdl"
1111

12+
spawn-sh-at-startup "bash ~/nix-config/home/linux/gui/niri/reorder-workspaces.sh"
13+
1214
// Input device configuration.
1315
// Find the full list of options on the wiki:
1416
// https://yalter.github.io/niri/Configuration:-Input

‎home/linux/gui/niri/conf/keybindings.kdl‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -149,26 +149,26 @@ binds {
149149
//
150150
// For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
151151
// will all refer to the 3rd workspace.
152-
//Mod+1 { focus-workspace "1terminal"; }
153-
//Mod+2 { focus-workspace "2browser"; }
154-
//Mod+3 { focus-workspace "3chat"; }
155-
//Mod+4 { focus-workspace "4music"; }
156-
//Mod+5 { focus-workspace "5mail"; }
157-
//Mod+6 { focus-workspace "6file"; }
158-
//Mod+7 { focus-workspace 7; }
159-
//Mod+8 { focus-workspace 8; }
160-
//Mod+9 { focus-workspace 9; }
161-
//Mod+0 { focus-workspace "0other"; }
162-
//Mod+Ctrl+1 { move-column-to-workspace "1terminal"; }
163-
//Mod+Ctrl+2 { move-column-to-workspace "2browser"; }
164-
//Mod+Ctrl+3 { move-column-to-workspace "3chat"; }
165-
//Mod+Ctrl+4 { move-column-to-workspace "4music"; }
166-
//Mod+Ctrl+5 { move-column-to-workspace "5mail"; }
167-
//Mod+Ctrl+6 { move-column-to-workspace "6file"; }
168-
//Mod+Ctrl+7 { move-column-to-workspace 7; }
169-
//Mod+Ctrl+8 { move-column-to-workspace 8; }
170-
//Mod+Ctrl+9 { move-column-to-workspace 9; }
171-
//Mod+Ctrl+0 { move-column-to-workspace "0other"; }
152+
// Mod+1 { focus-workspace "1terminal"; }
153+
// Mod+2 { focus-workspace "2browser"; }
154+
// Mod+3 { focus-workspace "3chat"; }
155+
// Mod+4 { focus-workspace "4music"; }
156+
// Mod+5 { focus-workspace "5mail"; }
157+
// Mod+6 { focus-workspace "6file"; }
158+
// Mod+7 { focus-workspace "7"; }
159+
// Mod+8 { focus-workspace "8"; }
160+
// Mod+9 { focus-workspace "9"; }
161+
// Mod+0 { focus-workspace "0other"; }
162+
// Mod+Ctrl+1 { move-column-to-workspace "1terminal"; }
163+
// Mod+Ctrl+2 { move-column-to-workspace "2browser"; }
164+
// Mod+Ctrl+3 { move-column-to-workspace "3chat"; }
165+
// Mod+Ctrl+4 { move-column-to-workspace "4music"; }
166+
// Mod+Ctrl+5 { move-column-to-workspace "5mail"; }
167+
// Mod+Ctrl+6 { move-column-to-workspace "6file"; }
168+
// Mod+Ctrl+7 { move-column-to-workspace "7"; }
169+
// Mod+Ctrl+8 { move-column-to-workspace "8"; }
170+
// Mod+Ctrl+9 { move-column-to-workspace "9"; }
171+
// Mod+Ctrl+0 { move-column-to-workspace "0other"; }
172172

173173
// use index to name workspaces
174174
Mod+1 { focus-workspace 1; }

‎home/linux/gui/niri/reorder-workspaces.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
# Reorder named workspaces so indices match their numeric prefixes:
5+
# 1 → "1terminal", 2 → "2browser", ..., 6 → "6file", 10 → "0other".
6+
# Requires a running niri session and the `niri msg` command in PATH.
7+
8+
niri msg action move-workspace-to-index 1 --reference "1terminal"
9+
niri msg action move-workspace-to-index 2 --reference "2browser"
10+
niri msg action move-workspace-to-index 3 --reference "3chat"
11+
niri msg action move-workspace-to-index 4 --reference "4music"
12+
niri msg action move-workspace-to-index 5 --reference "5mail"
13+
niri msg action move-workspace-to-index 6 --reference "6file"
14+
niri msg action move-workspace-to-index 7 --reference "7"
15+
niri msg action move-workspace-to-index 8 --reference "8"
16+
niri msg action move-workspace-to-index 9 --reference "9"
17+
niri msg action move-workspace-to-index 10 --reference "0other"

‎hosts/12kingdoms-shoukei/niri-hardware.kdl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ workspace "3chat" { open-on-output "eDP-1"; }
1010
workspace "4music" { open-on-output "eDP-1"; }
1111
workspace "5mail" { open-on-output "eDP-1"; }
1212
workspace "6file" { open-on-output "eDP-1"; }
13+
workspace "7" { open-on-output "eDP-1"; }
14+
workspace "8" { open-on-output "eDP-1"; }
15+
workspace "9" { open-on-output "eDP-1"; }
1316
workspace "0other" { open-on-output "eDP-1"; }
1417
debug { render-drm-device "/dev/dri/renderD128"; }
1518

‎hosts/idols-ai/niri-hardware.kdl‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ output "eDP-1" {
3535
//workspace "4gaming" { open-on-output "eDP-1"; }
3636
//workspace "5music" { open-on-output "eDP-1"; }
3737

38-
//workspace "1terminal" { open-on-output "eDP-1"; }
39-
//workspace "3chat" { open-on-output "eDP-1"; }
40-
//workspace "6file" { open-on-output "eDP-1"; }
41-
//workspace "0other" { open-on-output "eDP-1"; }
38+
// workspace "1terminal" { open-on-output "HDMI-A-1"; }
39+
// workspace "3chat" { open-on-output "HDMI-A-1"; }
40+
// workspace "6file" { open-on-output "HDMI-A-1"; }
41+
// workspace "7" { open-on-output "HDMI-A-1"; }
42+
// workspace "8" { open-on-output "HDMI-A-1"; }
43+
// workspace "9" { open-on-output "HDMI-A-1"; }
44+
// workspace "0other" { open-on-output "HDMI-A-1"; }

‎modules/nixos/base/packages.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
nmon
3131
sysbench
3232
systemctl-tui
33+
pv # pipe view
3334

3435
# system tools
3536
psmisc # killall/pstree/prtstat/fuser/...
@@ -41,6 +42,9 @@
4142
hdparm # for disk performance, command
4243
dmidecode # a tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard
4344
parted
45+
smartmontools # smartctl -a /dev/nvme0n1
46+
nvme-cli
47+
4448
fh.packages.${system}.default
4549
];
4650

0 commit comments

Comments
 (0)