diff --git a/flake.lock b/flake.lock index 7d674c4..80416a1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1771513958, - "narHash": "sha256-KoDcVuYgmP/kX6pd9uCW5Wo5Xn3y0SumrMaCLu5ojdY=", + "lastModified": 1771215876, + "narHash": "sha256-aei7McII5+y4tROXfmOVyLbPO62sWttNkOKUlCSEIcg=", "owner": "nyakase", "repo": "aerothemeplasma-nix", - "rev": "348cbf661738840d0ae02d5eda7f4c076e59b733", + "rev": "b922785202501754c4503232aa5f172aeaef8b00", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "base16-discord": { "flake": false, "locked": { - "lastModified": 1771164756, - "narHash": "sha256-6NU5HQZVZ1mSNaIyZxE+U35nF46uXH/768y3auhQdiI=", + "lastModified": 1768273180, + "narHash": "sha256-uw7lz53YHxvPEyXZiS+NJFhKMb6AMUvVpCLH81NjM7U=", "owner": "imbypass", "repo": "base16-discord", - "rev": "8b005607e5783f751fe369f0442965a86eed8051", + "rev": "d4df17db31276d94cc1a8988f34e813aae1f3fb4", "type": "github" }, "original": { @@ -77,11 +77,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1771263855, - "narHash": "sha256-akyds1g8cb742d2OrnQ4YciscpynsQ0+0YD2a8aZdvo=", + "lastModified": 1771517207, + "narHash": "sha256-+zDtnmXNyMd3hMepErdPDZzqYS0PiZA0Anbbx9Pvs4g=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "5ece16c7b4a7d1261da68153cafc318a60b78ce8", + "rev": "39737576a25091a3c4ca00729b769a1f92ec98d5", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1771399550, - "narHash": "sha256-Q2rMJcwZiI1rn8H27gLleKA3ATW/EykukyGR6S1tBPk=", + "lastModified": 1771516433, + "narHash": "sha256-SuockPZgd2bfjWGmdT8AUBTnBZWvxdA+b8Ss98lNC6c=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "021aae790c8555a4bb6e2135c6b777bf6fdcba02", + "rev": "505aef2086e584ba683a5ac1cb8ed8252fea2cfd", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "catppuccin-discord": { "flake": false, "locked": { - "lastModified": 1770426312, - "narHash": "sha256-rxvHIifq5CYIBPwFA2SpOrWT+sG/z0ItXT3sx2wbEqg=", + "lastModified": 1769446491, + "narHash": "sha256-7v1Hu6QofOyFOGnHeqHFK0JsxUxdJ9uTjI7nM7mdTsg=", "owner": "catppuccin", "repo": "discord", - "rev": "b9b5547f0b32296d2389716ef606de87b3c1e7c7", + "rev": "f235754322320211a8646d963466fac402e5c297", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1771519029, - "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", + "lastModified": 1769579508, + "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", "owner": "nix-community", "repo": "home-manager", - "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", + "rev": "eec72f127831326b042d1f35003767a4ab6a9516", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "niri-blur": { "flake": false, "locked": { - "lastModified": 1771672342, - "narHash": "sha256-52CxMRH2kVGpsPBiZM+996b6i/3XkmOrySm5zqwWc+o=", + "lastModified": 1771749270, + "narHash": "sha256-ZJCM1XOHIdud6Jfpl4jYQOzbOJId9wmXT+hNJ1IPBIY=", "owner": "niri-wm", "repo": "niri", - "rev": "86f42d1ed9ab787c52ace073e0b3218e26530d25", + "rev": "734d86ec061d15d1980c5b940b2f4dc9aee80cf5", "type": "github" }, "original": { @@ -325,11 +325,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1771438239, - "narHash": "sha256-/d5FnrQ1nvZ9n1I7o/hMTzjd8tTBvV5rT24Nh7h59RQ=", + "lastModified": 1771525883, + "narHash": "sha256-XqDuaRbxLGno5HcWRE5lQrgMBeXXs6ncGq+R6eCvsq8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "58f338b00bc5619144a6f3082eed5c83e79b279b", + "rev": "15fb6039dd248d478a8f3f7f6c067b206da2bf54", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1771419570, - "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -419,11 +419,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771353015, - "narHash": "sha256-gvMwFEdFCM2zFxLVDaAbhV2N9zK0IW/RceBundHUdZs=", + "lastModified": 1771482645, + "narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "931ef4db402cdab9dfe66fe4a2b01d50f6fe435d", + "rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1771135771, - "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", + "lastModified": 1769537308, + "narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=", "owner": "nix-community", "repo": "nixvim", - "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", + "rev": "7addac6d111837217c16762968a9042eac703f7e", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1771513929, - "narHash": "sha256-dPeHevAT1Cb2w/Wrfz/d5i6RfO8bvbGl/KrTPxU2l3w=", + "lastModified": 1769607092, + "narHash": "sha256-P0KGVjKtN+hkZWskpxr2iXWalPb0SKAgRVyMFZxdxf0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9c47ce03f200e0b8fc515d973440d5bc3e359785", + "rev": "b2b16ecdda1bc04001a7c714bf8124160a86ddfc", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1771516225, - "narHash": "sha256-G2cPs4Ic8Z1Aq8QfMa1VwJoBwIhVpwzcQ036ZhI4oXc=", + "lastModified": 1769604042, + "narHash": "sha256-KQGbmKSY3tA4S8qFN76xd+3cbM0mAtPgoUVbjWrprcs=", "owner": "nix-community", "repo": "NUR", - "rev": "d4694f0614419034910767b5a036384ab358b138", + "rev": "92f5f3f18a365341dd424314a80253f5ede071e4", "type": "github" }, "original": { @@ -509,7 +509,6 @@ "original": { "owner": "OpenMW", "repo": "openmw", - "rev": "01bcd6a6369fe461caaf900354967b4751aede7a", "type": "gitlab" } }, @@ -523,11 +522,11 @@ ] }, "locked": { - "lastModified": 1770766818, - "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", + "lastModified": 1767662275, + "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "44b928068359b7d2310a34de39555c63c93a2c90", + "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", "type": "github" }, "original": { @@ -569,11 +568,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1771268051, - "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", + "lastModified": 1769316930, + "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", + "rev": "b2ce438f386943ef611e196a178af2d79042903b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c96b188..e07a23f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,15 +4,12 @@ inputs = { nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; 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 nixpkgs.follows = "nixpkgs-unstable"; - nix-cachyos-kernel = { - url = "github:xddxdd/nix-cachyos-kernel/release"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - base16 = { url = "github:SenchoPens/base16.nix"; }; @@ -81,13 +78,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - apple-silicon = { - url = "github:nix-community/nixos-apple-silicon"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - openmw = { - url = "gitlab:OpenMW/openmw/01bcd6a6369fe461caaf900354967b4751aede7a"; + url = "gitlab:OpenMW/openmw"; flake = false; }; @@ -101,6 +93,7 @@ { nixpkgs, nixpkgs-unstable, + apple-silicon, nix-cachyos-kernel, base16, tt-schemes, @@ -113,7 +106,6 @@ spicetify-nix, nur, nixvim, - apple-silicon, openmw, catppuccin-discord, ... diff --git a/home/apps/discord.nix b/home/apps/discord.nix index e488076..c0c6683 100644 --- a/home/apps/discord.nix +++ b/home/apps/discord.nix @@ -4,9 +4,12 @@ ... }: let + catppuccin-discord = "${pkgs.catppuccin-discord}/share/catppuccin-discord/catppuccin-mocha-*.theme.css"; + mergedThemes = pkgs.runCommand "mergedConfig" { } '' mkdir -p $out cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css + cp -rvf ${catppuccin-discord} $out ''; vesktopSettings = { diff --git a/home/default.nix b/home/default.nix index dffbadd..f714d1c 100755 --- a/home/default.nix +++ b/home/default.nix @@ -39,7 +39,7 @@ ffmpeg-full # kde and kde theming - # kde-rounded-corners + kde-rounded-corners kdePackages.partitionmanager pkgs.catppuccin-cursors.mochaPeach diff --git a/home/kde/default.nix b/home/kde/default.nix index 17814d4..e383cf5 100644 --- a/home/kde/default.nix +++ b/home/kde/default.nix @@ -23,11 +23,11 @@ }; }; - # aerothemeplasma = { - # enable = true; - # plasma.enable = true; - # fonts.enable = true; - # }; + aerothemeplasma = { + enable = true; + plasma.enable = true; + fonts.enable = true; + }; programs.plasma = lib.mkDefault { enable = true; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 199b841..245ef15 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -128,6 +128,20 @@ }; 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 = [ { @@ -200,6 +214,10 @@ saturation = 1; }; } + { + matches = [ { namespace = "noctalia-bar-exclusion-top-.*$"; } ]; + place-within-backdrop = true; + } { matches = [ { namespace = "^launcher$"; } ]; opacity = 0.90; @@ -217,20 +235,6 @@ ]; binds = { "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" = { action.spawn = [ "kitty" ]; @@ -242,24 +246,18 @@ }; "Mod+Space" = { action.spawn = [ "fuzzel" ]; - hotkey-overlay.title = "Run an Application: Fuzzel"; + hotkey-overlay.title = "Run an Application: Noctalia app launcher"; }; "XF86AudioRaiseVolume" = { - action.spawn = [ - "wpctl" - "set-volume" - "@DEFAULT_AUDIO_SINK@" - "0.05+" + action.spawn-sh = [ + "noctalia-shell ipc call volume increase" ]; allow-when-locked = true; }; "XF86AudioLowerVolume" = { - action.spawn = [ - "wpctl" - "set-volume" - "@DEFAULT_AUDIO_SINK@" - "0.05-" + action.spawn-sh = [ + "noctalia-shell ipc call volume decrease" ]; allow-when-locked = true; }; @@ -284,20 +282,14 @@ }; "MouseForward" = { - action.spawn = [ - "wpctl" - "set-volume" - "@DEFAULT_AUDIO_SINK@" - "0.05+" + action.spawn-sh = [ + "noctalia-shell ipc call volume increase" ]; allow-when-locked = true; }; "MouseBack" = { - action.spawn = [ - "wpctl" - "set-volume" - "@DEFAULT_AUDIO_SINK@" - "0.05-" + action.spawn-sh = [ + "noctalia-shell ipc call volume decrease" ]; allow-when-locked = true; }; @@ -322,20 +314,14 @@ }; "XF86AudioMute" = { - action.spawn = [ - "wpctl" - "set-mute" - "@DEFAULT_AUDIO_SINK@" - "toggle" + action.spawn-sh = [ + "noctalia-shell ipc call volume muteOutput" ]; allow-when-locked = true; }; "XF86AudioMicMute" = { - action.spawn = [ - "wpctl" - "set-mute" - "@DEFAULT_AUDIO_SOURCE@" - "toggle" + action.spawn-sh = [ + "noctalia-shell ipc call volume muteInput" ]; allow-when-locked = true; }; diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index 2ee319e..85a915f 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -595,22 +595,24 @@ systemd.user.services.noctalia-shell = { Unit = { - After = [ "graphical-session.target" ]; - PartOf = [ "graphical-session.target" ]; + After = [ "niri.service" ]; + PartOf = [ "niri.service" ]; Description = "Noctalia Shell - Wayland desktop shell"; - Documentation = "https://docs.noctalia.dev"; - X-Restart-Triggers = [ - "${config.xdg.configFile."noctalia/settings.json".source}" - "${config.xdg.configFile."noctalia/colors.json".source}" - ]; + Documentation = "https://docs.noctalia.dev/docs"; }; Service = { ExecStart = "${pkgs.noctalia-shell}/bin/noctalia-shell"; 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" ]; }; }