Compare commits

..

20 commits

Author SHA1 Message Date
af3aa0b641
update flake after rebase 2026-02-24 12:33:09 -05:00
ef743497fd
move macbook display to its home/hosts 2026-02-24 12:16:58 -05:00
f31403df40
changes to niri & firefox 2026-02-24 12:16:58 -05:00
578f23fea0
peach -> hopscotch theme 2026-02-24 12:16:57 -05:00
a2a60cc81c
change niri and noctalia opacities 2026-02-24 12:16:57 -05:00
c5dcfce75f
fix VM 2026-02-24 12:16:57 -05:00
c4eae904f3
colorize wallpaper 2026-02-24 12:16:57 -05:00
9403b98754
switch from awww to wbg, fight over? 2026-02-24 12:16:57 -05:00
b3e6f7f175
reformat niri 2026-02-24 12:16:57 -05:00
a112c46355
wallpaper updates in prep to switch to wbg 2026-02-24 12:16:57 -05:00
46cd9eec30
refactor session vars 2026-02-24 12:16:56 -05:00
7b6e3a2deb
update system/default.nix 2026-02-24 12:16:55 -05:00
edb0bb4528
add niri blur 2026-02-24 12:16:29 -05:00
30b103d349
make systemd services more robust 2026-02-24 12:16:29 -05:00
9be05afa2d
peach: frappe -> mocha 2026-02-24 12:16:29 -05:00
118b190aba
switch from mpvpaper to awww, refactor wallpaper 2026-02-24 12:16:29 -05:00
15f796401e
fix: wallpaper aspect ratio 2026-02-24 12:16:29 -05:00
1b3c7412ae
add torrenting config 2026-02-24 12:16:29 -05:00
1a0012bbf3
move searxng to port 5364 2026-02-24 12:16:29 -05:00
0395c66547
switch from wpaperd to mpvpaper 2026-02-24 12:16:28 -05:00
7 changed files with 106 additions and 124 deletions

103
flake.lock generated
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771513958, "lastModified": 1771215876,
"narHash": "sha256-KoDcVuYgmP/kX6pd9uCW5Wo5Xn3y0SumrMaCLu5ojdY=", "narHash": "sha256-aei7McII5+y4tROXfmOVyLbPO62sWttNkOKUlCSEIcg=",
"owner": "nyakase", "owner": "nyakase",
"repo": "aerothemeplasma-nix", "repo": "aerothemeplasma-nix",
"rev": "348cbf661738840d0ae02d5eda7f4c076e59b733", "rev": "b922785202501754c4503232aa5f172aeaef8b00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
"base16-discord": { "base16-discord": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771164756, "lastModified": 1768273180,
"narHash": "sha256-6NU5HQZVZ1mSNaIyZxE+U35nF46uXH/768y3auhQdiI=", "narHash": "sha256-uw7lz53YHxvPEyXZiS+NJFhKMb6AMUvVpCLH81NjM7U=",
"owner": "imbypass", "owner": "imbypass",
"repo": "base16-discord", "repo": "base16-discord",
"rev": "8b005607e5783f751fe369f0442965a86eed8051", "rev": "d4df17db31276d94cc1a8988f34e813aae1f3fb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771263855, "lastModified": 1771517207,
"narHash": "sha256-akyds1g8cb742d2OrnQ4YciscpynsQ0+0YD2a8aZdvo=", "narHash": "sha256-+zDtnmXNyMd3hMepErdPDZzqYS0PiZA0Anbbx9Pvs4g=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "5ece16c7b4a7d1261da68153cafc318a60b78ce8", "rev": "39737576a25091a3c4ca00729b769a1f92ec98d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771399550, "lastModified": 1771516433,
"narHash": "sha256-Q2rMJcwZiI1rn8H27gLleKA3ATW/EykukyGR6S1tBPk=", "narHash": "sha256-SuockPZgd2bfjWGmdT8AUBTnBZWvxdA+b8Ss98lNC6c=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "021aae790c8555a4bb6e2135c6b777bf6fdcba02", "rev": "505aef2086e584ba683a5ac1cb8ed8252fea2cfd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
"catppuccin-discord": { "catppuccin-discord": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770426312, "lastModified": 1769446491,
"narHash": "sha256-rxvHIifq5CYIBPwFA2SpOrWT+sG/z0ItXT3sx2wbEqg=", "narHash": "sha256-7v1Hu6QofOyFOGnHeqHFK0JsxUxdJ9uTjI7nM7mdTsg=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "discord", "repo": "discord",
"rev": "b9b5547f0b32296d2389716ef606de87b3c1e7c7", "rev": "f235754322320211a8646d963466fac402e5c297",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1768135262,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771519029, "lastModified": 1769579508,
"narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", "rev": "eec72f127831326b042d1f35003767a4ab6a9516",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,11 +302,11 @@
"niri-blur": { "niri-blur": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771672342, "lastModified": 1771749270,
"narHash": "sha256-52CxMRH2kVGpsPBiZM+996b6i/3XkmOrySm5zqwWc+o=", "narHash": "sha256-ZJCM1XOHIdud6Jfpl4jYQOzbOJId9wmXT+hNJ1IPBIY=",
"owner": "niri-wm", "owner": "niri-wm",
"repo": "niri", "repo": "niri",
"rev": "86f42d1ed9ab787c52ace073e0b3218e26530d25", "rev": "734d86ec061d15d1980c5b940b2f4dc9aee80cf5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -325,11 +325,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1771438239, "lastModified": 1771525883,
"narHash": "sha256-/d5FnrQ1nvZ9n1I7o/hMTzjd8tTBvV5rT24Nh7h59RQ=", "narHash": "sha256-XqDuaRbxLGno5HcWRE5lQrgMBeXXs6ncGq+R6eCvsq8=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "58f338b00bc5619144a6f3082eed5c83e79b279b", "rev": "15fb6039dd248d478a8f3f7f6c067b206da2bf54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1771419570, "lastModified": 1769598131,
"narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +403,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1769461804,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb", "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,11 +419,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1771353015, "lastModified": 1771482645,
"narHash": "sha256-gvMwFEdFCM2zFxLVDaAbhV2N9zK0IW/RceBundHUdZs=", "narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "931ef4db402cdab9dfe66fe4a2b01d50f6fe435d", "rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +442,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1771135771, "lastModified": 1769537308,
"narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", "narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", "rev": "7addac6d111837217c16762968a9042eac703f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -462,11 +462,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771513929, "lastModified": 1769607092,
"narHash": "sha256-dPeHevAT1Cb2w/Wrfz/d5i6RfO8bvbGl/KrTPxU2l3w=", "narHash": "sha256-P0KGVjKtN+hkZWskpxr2iXWalPb0SKAgRVyMFZxdxf0=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "9c47ce03f200e0b8fc515d973440d5bc3e359785", "rev": "b2b16ecdda1bc04001a7c714bf8124160a86ddfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +483,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771516225, "lastModified": 1769604042,
"narHash": "sha256-G2cPs4Ic8Z1Aq8QfMa1VwJoBwIhVpwzcQ036ZhI4oXc=", "narHash": "sha256-KQGbmKSY3tA4S8qFN76xd+3cbM0mAtPgoUVbjWrprcs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d4694f0614419034910767b5a036384ab358b138", "rev": "92f5f3f18a365341dd424314a80253f5ede071e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,7 +509,6 @@
"original": { "original": {
"owner": "OpenMW", "owner": "OpenMW",
"repo": "openmw", "repo": "openmw",
"rev": "01bcd6a6369fe461caaf900354967b4751aede7a",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -523,11 +522,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770766818, "lastModified": 1767662275,
"narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "44b928068359b7d2310a34de39555c63c93a2c90", "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -569,11 +568,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1771268051, "lastModified": 1769316930,
"narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", "rev": "b2ce438f386943ef611e196a178af2d79042903b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,15 +4,12 @@
inputs = { inputs = {
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
apple-silicon.url = "github:nix-community/nixos-apple-silicon";
nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
# edit this to switch between stable and unstable # edit this to switch between stable and unstable
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs-unstable";
nix-cachyos-kernel = {
url = "github:xddxdd/nix-cachyos-kernel/release";
# inputs.nixpkgs.follows = "nixpkgs";
};
base16 = { base16 = {
url = "github:SenchoPens/base16.nix"; url = "github:SenchoPens/base16.nix";
}; };
@ -81,13 +78,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
apple-silicon = {
url = "github:nix-community/nixos-apple-silicon";
# inputs.nixpkgs.follows = "nixpkgs";
};
openmw = { openmw = {
url = "gitlab:OpenMW/openmw/01bcd6a6369fe461caaf900354967b4751aede7a"; url = "gitlab:OpenMW/openmw";
flake = false; flake = false;
}; };
@ -101,6 +93,7 @@
{ {
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
apple-silicon,
nix-cachyos-kernel, nix-cachyos-kernel,
base16, base16,
tt-schemes, tt-schemes,
@ -113,7 +106,6 @@
spicetify-nix, spicetify-nix,
nur, nur,
nixvim, nixvim,
apple-silicon,
openmw, openmw,
catppuccin-discord, catppuccin-discord,
... ...

View file

@ -4,9 +4,12 @@
... ...
}: }:
let let
catppuccin-discord = "${pkgs.catppuccin-discord}/share/catppuccin-discord/catppuccin-mocha-*.theme.css";
mergedThemes = pkgs.runCommand "mergedConfig" { } '' mergedThemes = pkgs.runCommand "mergedConfig" { } ''
mkdir -p $out mkdir -p $out
cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css
cp -rvf ${catppuccin-discord} $out
''; '';
vesktopSettings = { vesktopSettings = {

View file

@ -39,7 +39,7 @@
ffmpeg-full ffmpeg-full
# kde and kde theming # kde and kde theming
# kde-rounded-corners kde-rounded-corners
kdePackages.partitionmanager kdePackages.partitionmanager
pkgs.catppuccin-cursors.mochaPeach pkgs.catppuccin-cursors.mochaPeach

View file

@ -23,11 +23,11 @@
}; };
}; };
# aerothemeplasma = { aerothemeplasma = {
# enable = true; enable = true;
# plasma.enable = true; plasma.enable = true;
# fonts.enable = true; fonts.enable = true;
# }; };
programs.plasma = lib.mkDefault { programs.plasma = lib.mkDefault {
enable = true; enable = true;

View file

@ -128,6 +128,20 @@
}; };
draw-border-with-background = false; draw-border-with-background = false;
} }
{
matches = [
{
app-id = "firefox$";
title = "^Picture-in-Picture$";
}
];
open-floating = true;
default-floating-position = {
x = 16;
y = 16;
relative-to = "bottom-left";
};
}
{ {
matches = [ matches = [
{ {
@ -200,6 +214,10 @@
saturation = 1; saturation = 1;
}; };
} }
{
matches = [ { namespace = "noctalia-bar-exclusion-top-.*$"; } ];
place-within-backdrop = true;
}
{ {
matches = [ { namespace = "^launcher$"; } ]; matches = [ { namespace = "^launcher$"; } ];
opacity = 0.90; opacity = 0.90;
@ -217,20 +235,6 @@
]; ];
binds = { binds = {
"Mod+Shift+Slash".action.show-hotkey-overlay = { }; "Mod+Shift+Slash".action.show-hotkey-overlay = { };
"Mod+D" = {
action.toggle-window-rule-opacity = { };
repeat = false;
};
"Mod+M" = {
action.spawn = [
"wpctl"
"set-mute"
"@DEFAULT_AUDIO_SOURCE@"
"toggle"
];
hotkey-overlay.title = "Toggle Microphone Mute";
repeat = false;
};
"Mod+T" = { "Mod+T" = {
action.spawn = [ "kitty" ]; action.spawn = [ "kitty" ];
@ -242,24 +246,18 @@
}; };
"Mod+Space" = { "Mod+Space" = {
action.spawn = [ "fuzzel" ]; action.spawn = [ "fuzzel" ];
hotkey-overlay.title = "Run an Application: Fuzzel"; hotkey-overlay.title = "Run an Application: Noctalia app launcher";
}; };
"XF86AudioRaiseVolume" = { "XF86AudioRaiseVolume" = {
action.spawn = [ action.spawn-sh = [
"wpctl" "noctalia-shell ipc call volume increase"
"set-volume"
"@DEFAULT_AUDIO_SINK@"
"0.05+"
]; ];
allow-when-locked = true; allow-when-locked = true;
}; };
"XF86AudioLowerVolume" = { "XF86AudioLowerVolume" = {
action.spawn = [ action.spawn-sh = [
"wpctl" "noctalia-shell ipc call volume decrease"
"set-volume"
"@DEFAULT_AUDIO_SINK@"
"0.05-"
]; ];
allow-when-locked = true; allow-when-locked = true;
}; };
@ -284,20 +282,14 @@
}; };
"MouseForward" = { "MouseForward" = {
action.spawn = [ action.spawn-sh = [
"wpctl" "noctalia-shell ipc call volume increase"
"set-volume"
"@DEFAULT_AUDIO_SINK@"
"0.05+"
]; ];
allow-when-locked = true; allow-when-locked = true;
}; };
"MouseBack" = { "MouseBack" = {
action.spawn = [ action.spawn-sh = [
"wpctl" "noctalia-shell ipc call volume decrease"
"set-volume"
"@DEFAULT_AUDIO_SINK@"
"0.05-"
]; ];
allow-when-locked = true; allow-when-locked = true;
}; };
@ -322,20 +314,14 @@
}; };
"XF86AudioMute" = { "XF86AudioMute" = {
action.spawn = [ action.spawn-sh = [
"wpctl" "noctalia-shell ipc call volume muteOutput"
"set-mute"
"@DEFAULT_AUDIO_SINK@"
"toggle"
]; ];
allow-when-locked = true; allow-when-locked = true;
}; };
"XF86AudioMicMute" = { "XF86AudioMicMute" = {
action.spawn = [ action.spawn-sh = [
"wpctl" "noctalia-shell ipc call volume muteInput"
"set-mute"
"@DEFAULT_AUDIO_SOURCE@"
"toggle"
]; ];
allow-when-locked = true; allow-when-locked = true;
}; };

View file

@ -595,22 +595,24 @@
systemd.user.services.noctalia-shell = { systemd.user.services.noctalia-shell = {
Unit = { Unit = {
After = [ "graphical-session.target" ]; After = [ "niri.service" ];
PartOf = [ "graphical-session.target" ]; PartOf = [ "niri.service" ];
Description = "Noctalia Shell - Wayland desktop shell"; Description = "Noctalia Shell - Wayland desktop shell";
Documentation = "https://docs.noctalia.dev"; Documentation = "https://docs.noctalia.dev/docs";
X-Restart-Triggers = [
"${config.xdg.configFile."noctalia/settings.json".source}"
"${config.xdg.configFile."noctalia/colors.json".source}"
];
}; };
Service = { Service = {
ExecStart = "${pkgs.noctalia-shell}/bin/noctalia-shell"; ExecStart = "${pkgs.noctalia-shell}/bin/noctalia-shell";
Restart = "on-failure"; Restart = "on-failure";
Environment = [ "QT_QPA_PLATFORMTHEME=qt6ct" ]; Environment = [
"LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale"
"TZDIR=${pkgs.tzdata}/share/zoneinfo"
"NOCTALIA_SETTINGS_FALLBACK=%h/.config/noctalia/gui-settings.json"
"QT_QPA_PLATFORM=wayland"
"QT_QPA_PLATFORMTHEME=qt6ct"
];
}; };
Install.WantedBy = [ "graphical-session.target" ]; Install.WantedBy = [ "niri.service" ];
}; };
} }