greyweather/nix-flake
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve gitignore, make niri shared config more modular

Browse Source
This commit is contained in:
greyweather committed 2026-09-17 03:11:53 +01:00
1 parent 882372c082
commit 66fe4cf9cf
12 files changed
+233 -86
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+2 -1
View File
@@ -1 +1,2 @@
**/plugins/sources/**
**/noctalia/plugins/*
!**/noctalia/plugins/data
dotfiles/shared/niri/biri-shared.kdl
+16
View File
@@ -0,0 +1,16 @@
binds {
Mod+Slash { spawn "niri-scratch-workspace-toggle"; }
Mod+Shift+Slash { move-window-to-workspace "x" focus=false; }
}
workspace "x" {
hidden true
layout {
focus-ring {
width 3
active-color "#a33d3d"
}
}
}
spawn-at-startup "niri-listen-for-scratch-workspace-change"
spawn-at-startup "niri-clear-state"
dotfiles/shared/niri/noctalia-shared.kdl
+34
View File
@@ -0,0 +1,34 @@
binds {
Mod+D hotkey-overlay-title="Application launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
Mod+C hotkey-overlay-title="Open calculator" { spawn "noctalia" "msg" "panel-toggle" "yuuto/calculator:panel"; }
Mod+L hotkey-overlay-title="Lock session" { spawn "noctalia" "msg" "session" "lock"; }
Mod+Shift+D hotkey-overlay-title="Edit desktop widgets" { spawn "noctalia" "msg" "desktop-widgets-edit"; }
Mod+Shift+B hotkey-overlay-title="Open bar settings" { spawn "noctalia" "msg" "settings-open" "bar"; }
Mod+Shift+S hotkey-overlay-title="Open settings" { spawn "noctalia" "msg" "settings-open"; }
Mod+Period hotkey-overlay-title="Open control center" { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
Mod+Shift+P hotkey-overlay-title="Open power menu" { spawn "noctalia" "msg" "panel-toggle" "session"; }
Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; }
Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; }
Mod+Shift+W { spawn "noctalia" "msg" "panel-toggle" "noctalia/wallhaven:browser"; }
Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; }
Mod+R hotkey-overlay-title="Open Remmina panel" { spawn "noctalia" "msg" "panel-toggle" "rylos/remmina:connections"; }
XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; }
XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; }
XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; }
XF86AudioMicMute { spawn "noctalia" "msg" "mic-mute"; }
XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; }
XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; }
XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; }
Pause { spawn "noctalia" "msg" "media" "toggle"; }
}
spawn-at-startup "noctalia"
layer-rule {
match namespace="^noctalia-backdrop"
place-within-backdrop true
}
dotfiles/shared/niri-shared.kdl → dotfiles/shared/niri/shared.kdl
+7 -48
View File
@@ -14,8 +14,11 @@ input {
focus-follows-mouse max-scroll-amount="0%"
}
prefer-no-csd
hotkey-overlay { skip-at-startup; }
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
hotkey-overlay {
skip-at-startup;
hide-not-bound;
}
screenshot-path "~/Pictures/Screenshots/%Y-%m-%d_%H-%M-%S.png"
cursor {
xcursor-theme "Bibata-Modern-Ice"
xcursor-size 22
@@ -32,8 +35,6 @@ layout {
}
}
binds {
Mod+D hotkey-overlay-title="Application launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
Mod+C hotkey-overlay-title="Open calculator" { spawn "noctalia" "msg" "panel-toggle" "yuuto/calculator:panel"; }
Mod+Return hotkey-overlay-title="Open terminal (Kitty)" { spawn "kitty"; }
Mod+O hotkey-overlay-title="Open Obsidian" { spawn "obsidian"; }
Mod+G hotkey-overlay-title="Open GitHub Desktop" { spawn "github-desktop"; }
@@ -47,19 +48,6 @@ binds {
Mod+Shift+F { fullscreen-window; }
Mod+Shift+E { quit; }
Mod+L hotkey-overlay-title="Lock session" { spawn "noctalia" "msg" "session" "lock"; }
Mod+Shift+D hotkey-overlay-title="Edit desktop widgets" { spawn "noctalia" "msg" "desktop-widgets-edit"; }
Mod+Shift+B hotkey-overlay-title="Open bar settings" { spawn "noctalia" "msg" "settings-open" "bar"; }
Mod+Shift+S hotkey-overlay-title="Open settings" { spawn "noctalia" "msg" "settings-open"; }
Mod+Period hotkey-overlay-title="Open control center" { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
Mod+Shift+P hotkey-overlay-title="Open power menu" { spawn "noctalia" "msg" "panel-toggle" "session"; }
Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; }
Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; }
Mod+Shift+W { spawn "noctalia" "msg" "panel-toggle" "noctalia/wallhaven:browser"; }
Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; }
Mod+R hotkey-overlay-title="Open Remmina panel" { spawn "noctalia" "msg" "panel-toggle" "rylos/remmina:connections"; }
Mod+Up { focus-workspace-up; }
Mod+Down { focus-workspace-down; }
Mod+Left { focus-column-left; }
@@ -72,33 +60,12 @@ binds {
Mod+Shift+Left { move-column-left; }
Mod+Shift+Right { move-column-right; }
XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; }
XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; }
XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; }
XF86AudioMicMute { spawn "noctalia" "msg" "mic-mute"; }
XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; }
XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; }
XF86WLAN { spawn-sh "rfkill toggle 0 || rfkill toggle 1"; }
XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; }
XF86Display { toggle-overview; }
Print { screenshot; }
Shift+Print { screenshot-window; }
Mod+Print { screenshot-screen; }
Mod+Slash { spawn "niri-scratch-workspace-toggle"; }
Mod+Shift+Slash { move-window-to-workspace "x" focus=false; }
Pause { spawn "noctalia" "msg" "media" "toggle"; }
}
workspace "x" {
hidden true
layout {
focus-ring {
width 3
active-color "#a33d3d"
}
}
}
window-rule {
draw-border-with-background false
@@ -116,17 +83,9 @@ window-rule { // Steam notifications are not focused and appear in bottom-right
default-floating-position x=10 y=10 relative-to="bottom-right"
open-focused false
}
spawn-at-startup "noctalia"
spawn-at-startup "niri-listen-for-scratch-workspace-change"
spawn-at-startup "niri-clear-state"
gestures { hot-corners { off; }; }
layer-rule {
match namespace="^noctalia-backdrop"
place-within-backdrop true
}
animations {
on
slowdown 1
@@ -148,6 +107,6 @@ animations {
spring damping-ratio=0.9 stiffness=750 epsilon=0.0001
}
window-resize {
spring damping-ratio=0.75 stiffness=700 epsilon=0.0001
spring damping-ratio=0.8 stiffness=850 epsilon=0.0001
}
}
}
dotfiles/takamaki/equibop/equicord-settings.json
+1 -1
View File
@@ -4,7 +4,7 @@
"authenticated": false,
"settingsSync": false,
"url": "https://cloud.equicord.org/",
"settingsSyncVersion": 1789498433782
"settingsSyncVersion": 1789605673754
},
"enableOnlineThemes": true,
"enabledThemeLinks": [
dotfiles/takamaki/niri.kdl
+2
View File
@@ -1,4 +1,6 @@
include "./shared.kdl"
include "./noctalia-shared.kdl"
include "./biri-shared.kdl"
input {
keyboard {
dotfiles/takamaki/noctalia/plugins/data/icefish/phone-connect/state.json
+1
View File
@@ -0,0 +1 @@
{"aliasMap":{"c8bbf88c5d984a27be9955a82078621f":"Galaxy A55"},"imageMap":{"c8bbf88c5d984a27be9955a82078621f":"/home/grey/Pictures/rei-ayanami-pfp.jpg"},"selected":"c8bbf88c5d984a27be9955a82078621f"}
dotfiles/takamaki/noctalia/settings.toml
+15 -8
View File
@@ -24,6 +24,7 @@ order = [ "default" ]
margin_opposite_edge = 8
padding = 10
position = "top"
radius = 6
shadow = false
start = []
thickness = 44
@@ -284,7 +285,7 @@ polkit_agent = true
popup_shadows = false
[shell.animation]
speed = 1.4000000208616257
speed = 1.5000000223517418
[shell.launcher]
categories = false
@@ -343,7 +344,7 @@ directory = "/home/grey/Pictures/Wallpapers"
path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
[wallpaper.last]
path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p-rotated.png"
[wallpaper.monitors.DP-2]
path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
@@ -366,18 +367,24 @@ directory = "/home/grey/Pictures/Wallpapers"
path = "/home/grey/Pictures/Wallpapers/everforest.webp"
theme_mode = "dark"
[[wallpaper.favorite]]
builtin_palette = "Nord"
palette_source = "builtin"
path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
theme_mode = "dark"
[[wallpaper.favorite]]
palette_source = "wallpaper"
path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
theme_mode = "dark"
wallpaper_scheme = "muted"
[[wallpaper.favorite]]
builtin_palette = "Nord"
palette_source = "builtin"
path = "/home/grey/Pictures/Wallpapers/frutiger-aero.png"
theme_mode = "dark"
[[wallpaper.favorite]]
builtin_palette = "Nord"
palette_source = "builtin"
path = "/home/grey/Pictures/Wallpapers/clouds.jpg"
theme_mode = "dark"
[widget.active_window]
anchor = true
display = "icon_and_text"
flake.lock
Generated
+129 -21
View File
@@ -76,11 +76,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1789012949,
"narHash": "sha256-KBgLlh6RZxutLDtAF/s6hUYqlY2W4xtrfoL9H804LNs=",
"lastModified": 1789531373,
"narHash": "sha256-DxsYphGAbt4LXL7druVkwKPhDcudSSTcryqPXDCYHUY=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "0a05d0d144297405cb33aed943b93612e3fcf3fa",
"rev": "6d7da906a1c5d0a1104a97b1bdaaf1054339907d",
"type": "gitlab"
},
"original": {
@@ -207,11 +207,11 @@
]
},
"locked": {
"lastModified": 1789071706,
"narHash": "sha256-S+oyh2YSP9V5bSjWbbK0N7GxdxxMwgBfUOtUdVcAWc4=",
"lastModified": 1789482455,
"narHash": "sha256-pD3qVlQ4mUCFoTWrYtxecpSitQMsgJvJIN0FUIDZoEU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "150f9ce4ddd41544ea42eb9d6043a75bd615fa24",
"rev": "efa3ccb4c3cc90d832eab232976379058fa75aa3",
"type": "github"
},
"original": {
@@ -235,13 +235,71 @@
"type": "github"
}
},
"niri-flake": {
"inputs": {
"niri-stable": "niri-stable",
"niri-unstable": "niri-unstable",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable",
"xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1785857305,
"narHash": "sha256-25q05zpF1sqOCxPPUG9DPPGd+EDW7SiAOWCzBWRS7r0=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "9ee3e13b60643448228353097880521658b2fe0e",
"type": "github"
},
"original": {
"owner": "sodiboo",
"repo": "niri-flake",
"type": "github"
}
},
"niri-stable": {
"flake": false,
"locked": {
"lastModified": 1756556321,
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"ref": "v25.08",
"repo": "niri",
"type": "github"
}
},
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1785701241,
"narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"repo": "niri",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1789006805,
"narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=",
"lastModified": 1789546076,
"narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe",
"rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
"type": "github"
},
"original": {
@@ -253,11 +311,11 @@
},
"nixpkgs-26-05": {
"locked": {
"lastModified": 1789009968,
"narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=",
"lastModified": 1789542786,
"narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d58a46e3bc02d91ebe04667f8397752a749c0024",
"rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a",
"type": "github"
},
"original": {
@@ -282,6 +340,22 @@
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1782847189,
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"noctalia": {
"inputs": {
"nixpkgs": [
@@ -289,11 +363,11 @@
]
},
"locked": {
"lastModified": 1789065747,
"narHash": "sha256-kX5eqD+MGMtGNRw6Y86eNTvC1zYUye49ESaiCXY9n0o=",
"lastModified": 1789605353,
"narHash": "sha256-TVad1fHKAhumO671Ez81Kuw+ddAbkuaomORz+LPYPL4=",
"owner": "noctalia-dev",
"repo": "noctalia",
"rev": "0565d25c1d3f13c7432fd64d32d08e27dbaff444",
"rev": "3dd92fdc2c773be82c8feda1fd2a735a0780fcc4",
"type": "github"
},
"original": {
@@ -334,6 +408,7 @@
"helpers": "helpers",
"home-manager": "home-manager",
"import-tree": "import-tree",
"niri-flake": "niri-flake",
"nixpkgs": "nixpkgs",
"nixpkgs-26-05": "nixpkgs-26-05",
"noctalia": "noctalia",
@@ -350,11 +425,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1788683578,
"narHash": "sha256-bERpuakmPAC2b36zgXy6OXh+SkZUjbaV+vV2sPmm6p8=",
"lastModified": 1789291406,
"narHash": "sha256-lfZ7yAaTZMuAzOSLjJ7ivrKIFk0E11koWTVgkWSXwuE=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "a4ef43fb13e3615f36e5a0935aabe8cc29363dc9",
"rev": "09eed5c95105aada9ffabd4c7eb6b345dc4ba66f",
"type": "github"
},
"original": {
@@ -491,6 +566,39 @@
"type": "github"
}
},
"xwayland-satellite-stable": {
"flake": false,
"locked": {
"lastModified": 1755491097,
"narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "388d291e82ffbc73be18169d39470f340707edaa",
"type": "github"
},
"original": {
"owner": "Supreeeme",
"ref": "v0.7",
"repo": "xwayland-satellite",
"type": "github"
}
},
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1784679892,
"narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839",
"type": "github"
},
"original": {
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"type": "github"
}
},
"zen-browser": {
"inputs": {
"home-manager": [
@@ -501,11 +609,11 @@
]
},
"locked": {
"lastModified": 1789052017,
"narHash": "sha256-eMVl0S4U91QZqTHKpykeUhwiXV6U9X2UB6JxYtHLDG8=",
"lastModified": 1789584125,
"narHash": "sha256-C9BpLH4dNggam12nz/Fx/M0Vlbw8WcT/cpOc37DPQAA=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "36f84edf5f170d460ab3a1723b9283f169b817c7",
"rev": "a12d482485d877cc066516ea256b435b209a1a8c",
"type": "github"
},
"original": {
modules/capabilities/graphics.nix
+6 -1
View File
@@ -11,7 +11,7 @@
kdePackages.filelight
];
in {
flake.nixosModules.graphics = { pkgs, config, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: {
imports = [ self.nixosModules.graphicsOptions ];
environment.systemPackages = with pkgs; [
@@ -24,6 +24,11 @@ in {
iosevka-comfy.comfy
nerd-fonts.jetbrains-mono
];
features.applications.gui = {
vscode.enable = lib.mkDefault true;
kitty.enable = lib.mkDefault true;
};
};
flake.homeModules.graphics = { config, pkgs, ... }: {
modules/components/shells/noctalia.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: {
config = lib.mkIf ((config.components.shells == "noctalia")||(builtins.elem "noctalia" config.components.shells)) {
config = lib.mkIf (builtins.elem "noctalia" config.components.shells) {
environment.systemPackages = [
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
];
@@ -14,7 +14,7 @@
};
flake.homeModules.graphics = { pkgs, config, lib, inputs, ... }: {
config = lib.mkIf ((config.components.shells == "noctalia")||(builtins.elem "noctalia" config.components.shells)) {
config = lib.mkIf (builtins.elem "noctalia" config.components.shells) {
home = {
activation = {
linkNoctaliaState = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
modules/components/window-managers/niri.nix
+18 -4
View File
@@ -25,17 +25,31 @@
};
flake.homeModules.graphics = { config, pkgs, lib, inputs, ... }: {
home = lib.mkIf (builtins.elem "niri" config.components.windowManagers || builtins.elem "biri" config.components.windowManagers) {
activation = {
config = lib.mkIf (builtins.elem "niri" config.components.windowManagers || builtins.elem "biri" config.components.windowManagers) {
features.applications.gui = {
kitty.enable = lib.mkForce true;
};
home.activation = {
linkNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/config.kdl";
source = "${config.info.rootPath}/dotfiles/${config.info.hostName}/niri.kdl";
});
linkSharedConfig = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
linkSharedNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri-shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri/shared.kdl";
});
linkSharedNoctaliaNiriConfig = lib.mkIf (builtins.elem "noctalia" config.components.shells) (lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/noctalia-shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri/noctalia-shared.kdl";
}));
linkSharedBiriConfig = lib.mkIf (builtins.elem "biri" config.components.windowManagers) (lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/biri-shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri/biri-shared.kdl";
}));
};
};
};