summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock47
-rw-r--r--mako.nix1
-rw-r--r--niri.nix44
-rw-r--r--profile.nix2
4 files changed, 65 insertions, 29 deletions
diff --git a/flake.lock b/flake.lock
index 027ecd8..62b66eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -268,11 +268,11 @@
"systems": "systems_4"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -290,11 +290,11 @@
"zon2nix": "zon2nix"
},
"locked": {
- "lastModified": 1750884490,
- "narHash": "sha256-hRt8xWReiDFyR4MDFg7FCq1PtvJb8hmrelkifnu/7yI=",
+ "lastModified": 1752593456,
+ "narHash": "sha256-H/rJ/svNsq8Y7+jXtsOUJVRdWmmQnHXxVZe3wAo4lYo=",
"ref": "refs/heads/main",
- "rev": "fa47db5363bedc5c3c9add87a83427447a273a90",
- "revCount": 10771,
+ "rev": "f44c24ef88b9a663e760ad3a5a5866eb146b051e",
+ "revCount": 11226,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
@@ -412,11 +412,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
- "lastModified": 1750671555,
- "narHash": "sha256-6G/tp3vkZD5KTdOOcUeDMqckSD4sBqXN2hCIW08LPrs=",
+ "lastModified": 1752481954,
+ "narHash": "sha256-/PDplX/0EuhmjiQsksXLIq8D5t2QuOd8Tw8A9tLG0WE=",
"ref": "refs/heads/develop",
- "rev": "fd165d11ac6c3b48870588641c282e0b3aad16d8",
- "revCount": 724,
+ "rev": "7a4031725331435c1fe2a452c57608d9d03c3968",
+ "revCount": 730,
"type": "git",
"url": "ssh://git@github.com/grid-x/gxctl"
},
@@ -432,11 +432,11 @@
]
},
"locked": {
- "lastModified": 1750798083,
- "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
+ "lastModified": 1752603129,
+ "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
+ "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
"type": "github"
},
"original": {
@@ -573,27 +573,27 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1720691131,
- "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
+ "lastModified": 1751943650,
+ "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4",
+ "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
- "lastModified": 1750776420,
- "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
+ "lastModified": 1752480373,
+ "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
+ "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"type": "github"
},
"original": {
@@ -800,7 +800,8 @@
"zig": {
"inputs": {
"flake-compat": [
- "ghostty"
+ "ghostty",
+ "flake-compat"
],
"flake-utils": [
"ghostty",
@@ -846,8 +847,8 @@
},
"original": {
"owner": "jcollie",
- "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"repo": "zon2nix",
+ "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"type": "github"
}
}
diff --git a/mako.nix b/mako.nix
index 74a51ff..bacc2bb 100644
--- a/mako.nix
+++ b/mako.nix
@@ -7,7 +7,6 @@
border-size=0
font=monospace 14
default-timeout=15000
- on-notify=exec mpv /usr/share/sounds/freedesktop/stereo/message.oga
[urgency=high]
background-color=#bf616a
diff --git a/niri.nix b/niri.nix
index ad0f939..feeb14d 100644
--- a/niri.nix
+++ b/niri.nix
@@ -60,9 +60,8 @@
backdrop-color "#DDDDDD"
}
- spawn-at-startup "dbus-update-activation-environment" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP=sway"
- spawn-at-startup "/usr/libexec/pipewire-launcher"
- //spawn-at-startup "openrc --user gui"
+ spawn-at-startup "dbus-update-activation-environment" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP=niri"
+ spawn-at-startup "openrc" "--user" "gui"
spawn-at-startup "blueman-applet"
spawn-at-startup "mako"
@@ -155,6 +154,10 @@
Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
Mod+Ctrl+Shift+WheelScrollUp { move-column-left; }
+ Mod+S { set-dynamic-cast-window; }
+ Mod+Shift+S { set-dynamic-cast-monitor; }
+ Mod+Ctrl+S { clear-dynamic-cast-target; }
+
Mod+1 { focus-workspace "α"; }
Mod+2 { focus-workspace "γ"; }
Mod+3 { focus-workspace "δ"; }
@@ -258,6 +261,12 @@
}
window-rule {
+ match app-id=r#"^firefox$"#
+
+ block-out-from "screencast"
+ }
+
+ window-rule {
match app-id=r#"^Bitwarden$"#
open-on-workspace "res"
@@ -274,11 +283,38 @@
layer-rule {
- exclude namespace="^notifications$"
+ match namespace="^notifications$"
+ block-out-from "screencast"
+ }
+ layer-rule {
+ match namespace="^waybar$"
block-out-from "screencast"
}
+
+ window-rule {
+ match is-window-cast-target=true
+
+ focus-ring {
+ active-color "#f38ba8"
+ inactive-color "#7d0d2d"
+ }
+
+ border {
+ inactive-color "#7d0d2d"
+ }
+
+ shadow {
+ color "#7d0d2d70"
+ }
+
+ tab-indicator {
+ active-color "#f38ba8"
+ inactive-color "#7d0d2d"
+ }
+ }
+
// user private to hide private browser
// altgr-intl
'';
diff --git a/profile.nix b/profile.nix
index e48cb8f..520ad83 100644
--- a/profile.nix
+++ b/profile.nix
@@ -22,6 +22,7 @@
export BROWSER=/usr/bin/qutebrowser
export PATH=$PATH:$HOME/.local/bin/
export QT_QPA_PLATFORM=wayland
+ export XDG_CURRENT_DESKTOP=niri
# GO
export GOPATH=$XDG_DATA_HOME/go
@@ -63,7 +64,6 @@
if [[ "$(tty)" == "/dev/tty1" ]]
then
-
eval `ssh-agent`
if command -v niri 2>&1 >/dev/null