diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 72e0823..fe6bd41 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -15,9 +15,9 @@ include "shared/index.kdl" // Uncomment ONE of the following to use that environment: // For DankMaterialShell (DMS) -include "dms/index.kdl" +// include "dms/index.kdl" -//include "noctalia/index.kdl" +include "noctalia/index.kdl" //include "dms/binds.kdl" diff --git a/configs/niri/noctalia/binds.kdl b/configs/niri/noctalia/binds.kdl new file mode 100644 index 0000000..2192e43 --- /dev/null +++ b/configs/niri/noctalia/binds.kdl @@ -0,0 +1,27 @@ +binds { + + Mod+Shift+A { spawn "noctalia"; } + ALT+Tab { spawn "noctalia" "msg" "window-switcher" "toggle"; } + Mod+Space { spawn "noctalia" "msg" "panel-toggle" "launcher"; } + Mod+S { spawn "noctalia" "msg" "panel-toggle" "control-center"; } + Mod+comma { spawn "noctalia" "msg" "settings-toggle"; } + + // // ========================= + // // DMS Integration + // // ========================= + Mod+Alt+L hotkey-overlay-title="Notifications: Clear" { spawn "noctalia" "msg" "notification-clear-active"; } + // Mod+Alt+K hotkey-overlay-title="Notifications: Toggle" { spawn "dms" "ipc" "call" "notifications" "toggle"; } + // Mod+Alt+N hotkey-overlay-title="Workspace: Rename" { spawn "dms" "ipc" "workspace-rename" "toggle"; } + // Mod+Alt+P hotkey-overlay-title="Clipboard: Toggle" { spawn "dms" "ipc" "call" "clipboard" "toggle"; } + // Mod+Shift+Space hotkey-overlay-title="PlayerCtrl: Toggle" { spawn "playerctl" "play-pause"; } + + // // ========================= + // // DMS Media & Brightness + // // ========================= + XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia" "msg" "volume-up"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia" "msg" "volume-down"; } + XF86AudioMute allow-when-locked=true { spawn "noctalia" "msg" "volume-mute"; } + // XF86AudioMicMute allow-when-locked=true { spawn "noctalia" "msg" "call" "audio" "micmute"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "noctalia" "msg" "brightness-up"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "noctalia" "msg" "brightness-down"; } +} diff --git a/configs/niri/noctalia/index.kdl b/configs/niri/noctalia/index.kdl new file mode 100644 index 0000000..d132475 --- /dev/null +++ b/configs/niri/noctalia/index.kdl @@ -0,0 +1,2 @@ +include "./binds.kdl" +include "./startup.kdl" diff --git a/configs/niri/noctalia/startup.kdl b/configs/niri/noctalia/startup.kdl new file mode 100644 index 0000000..ee414dd --- /dev/null +++ b/configs/niri/noctalia/startup.kdl @@ -0,0 +1 @@ +spawn-at-startup "noctalia" diff --git a/configs/niri/shared/binds.kdl b/configs/niri/shared/binds.kdl index 2b409c2..b5dbe17 100644 --- a/configs/niri/shared/binds.kdl +++ b/configs/niri/shared/binds.kdl @@ -54,6 +54,7 @@ binds { Print { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; } Mod+P { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; } Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; } + Mod+M { spawn "nu" "~/.config/hypr/speak-selection.nu"; } // ========================= // Misc diff --git a/configs/niri/shared/startup.kdl b/configs/niri/shared/startup.kdl index 755ea89..e69de29 100644 --- a/configs/niri/shared/startup.kdl +++ b/configs/niri/shared/startup.kdl @@ -1,2 +0,0 @@ - -// spawn-at-startup "niri-touchscreen-gestures" diff --git a/flake.lock b/flake.lock index 558bf16..6286563 100644 --- a/flake.lock +++ b/flake.lock @@ -155,6 +155,43 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": [ + "hermenix", + "devenv" + ], + "flake-compat": [ + "hermenix", + "devenv", + "flake-compat" + ], + "git-hooks": [ + "hermenix", + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "hermenix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788181969, + "narHash": "sha256-OUB6hPlFBB9FRdZgZXSye4lDOg+fbrqKe8ePv2IM7NY=", + "owner": "cachix", + "repo": "cachix", + "rev": "98093e8eea6c1635ef1337a576fa76f3e8bd4f39", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, "claude-desktop": { "inputs": { "flake-utils": "flake-utils", @@ -191,6 +228,23 @@ "type": "github" } }, + "crate2nix": { + "flake": false, + "locked": { + "lastModified": 1772186516, + "narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=", + "owner": "rossng", + "repo": "crate2nix", + "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", + "type": "github" + }, + "original": { + "owner": "rossng", + "repo": "crate2nix", + "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", + "type": "github" + } + }, "dank-greeter": { "inputs": { "dank-qml-common": "dank-qml-common", @@ -382,6 +436,36 @@ "url": "https://flakehub.com/f/DeterminateSystems/determinate/3" } }, + "devenv": { + "inputs": { + "cachix": "cachix", + "crate2nix": "crate2nix", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_3", + "ghostty": "ghostty", + "git-hooks": "git-hooks_2", + "nix": "nix_3", + "nixd": "nixd", + "nixpkgs": [ + "hermenix", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1789480904, + "narHash": "sha256-anHWHTkxI7423/eUroN9Rc4+H8VIGyIUWq/hV1egBDQ=", + "owner": "cachix", + "repo": "devenv", + "rev": "0fd5e6d3a9b2ae6f10205a3e95e0ca58d526c5a6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -544,6 +628,22 @@ } }, "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1767039857, @@ -603,6 +703,28 @@ } }, "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "hermenix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788306937, + "narHash": "sha256-lbrI1UYVpFgKSsyrU9oeF7FHfnu8nLD9ja0ou9f2rxk=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f16b25b8c3d2809b87925d0b76652d7821a75c68", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "hermes-agent", @@ -623,7 +745,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -700,6 +822,23 @@ "type": "github" } }, + "ghostty": { + "flake": false, + "locked": { + "lastModified": 1786026742, + "narHash": "sha256-tRtgTg/i3w1nFdRHU2IGekfJN8EyP+HARW4MtoUZyqk=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "22d13172cde98a0a4dda05d3d6a3fcb0dd8ed018", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "22d13172cde98a0a4dda05d3d6a3fcb0dd8ed018", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -766,6 +905,33 @@ "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" } }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "hermenix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "hermenix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788267358, + "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "27555e2624241fb116b49095df4caaee85a25691", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -827,15 +993,16 @@ "hermenix": { "inputs": { "determinate": "determinate_2", + "devenv": "devenv", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1789611307, - "narHash": "sha256-iMt1eFWfXTYKTDdRvUGrVACU3GRTKUzpvxf87OPLhHU=", + "lastModified": 1789665660, + "narHash": "sha256-AzozWfAWTfImpSU4sWAwM7l/7wYem9n7y+7R0VzO97U=", "ref": "refs/heads/main", - "rev": "f5f6a98152c7ce76deb4ed5246ebd5836d40c815", - "revCount": 22, + "rev": "e07ae98c0bf17b77cbf5a3c8b8b0c59ea08b97c0", + "revCount": 26, "type": "git", "url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git" }, @@ -846,7 +1013,7 @@ }, "hermes-agent": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_8", "npm-lockfile-fix": "npm-lockfile-fix", @@ -1585,6 +1752,80 @@ "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" } }, + "nix_3": { + "inputs": { + "flake-compat": [ + "hermenix", + "devenv", + "flake-compat" + ], + "flake-parts": [ + "hermenix", + "devenv", + "flake-parts" + ], + "git-hooks-nix": [ + "hermenix", + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "hermenix", + "devenv", + "nixpkgs" + ], + "nixpkgs-23-11": [ + "hermenix", + "devenv" + ], + "nixpkgs-regression": [ + "hermenix", + "devenv" + ] + }, + "locked": { + "lastModified": 1788036898, + "narHash": "sha256-3NT3yTvoRT7+rxLDNovpyeTDIJkZlBoO72rcu2x9Y9o=", + "owner": "cachix", + "repo": "nix", + "rev": "b9b81726b38469c55b9706d80d37d6c73cc7f76c", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "devenv-2.35", + "repo": "nix", + "type": "github" + } + }, + "nixd": { + "inputs": { + "flake-parts": [ + "hermenix", + "devenv", + "flake-parts" + ], + "nixpkgs": [ + "hermenix", + "devenv", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1788165251, + "narHash": "sha256-ITHt6eU6DuwQqlNV1/wehvKYPE6J8sZIlv75CpDjcHI=", + "owner": "nix-community", + "repo": "nixd", + "rev": "e2ca72c353cfbc3d63e942fe9aeae4ec497863bf", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -1989,7 +2230,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "nixpkgs": [ "hyprland", "nixpkgs" @@ -2126,6 +2367,28 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "hermenix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788332415, + "narHash": "sha256-BTFrmyh0oaVDsvA9NNw0YpbbeppTwU0t70iVx672Ew8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "860d7c835ab91bfc8972b67092f5f2db8e9390a0", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "skygqts": { "inputs": { "nixpkgs": [ @@ -2153,7 +2416,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -2354,6 +2617,29 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "hermenix", + "devenv", + "nixd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "uv2nix": { "inputs": { "nixpkgs": [