diff --git a/flake.lock b/flake.lock index 83a6f41..42a20f9 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ ] }, "locked": { - "lastModified": 1780074561, - "narHash": "sha256-MTWqfyezv2Kkutq5xEm27iarrAFDD4s22WBK/Q4IOYo=", + "lastModified": 1780678125, + "narHash": "sha256-EOqBLRKjzpwDGpYrrNmLj/4FfGtKl856672aZzlcmL0=", "owner": "linyinfeng", "repo": "angrr", - "rev": "2297e507f80e9e672fc7ed3e5b2aaad2593e4add", + "rev": "f20f94fbb488bd29ccbebd1bdb13cc428cd48f82", "type": "github" }, "original": { @@ -189,26 +189,6 @@ "type": "github" } }, - "catppuccin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779910193, - "narHash": "sha256-CQD/mtBC1VYQgTpKR6LhD+gPJ9S3neN6rBo/RYFWDgM=", - "owner": "catppuccin", - "repo": "nix", - "rev": "c61cab9677ff7184891930a60bf8224aa81c3a31", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "nix", - "type": "github" - } - }, "crate2nix": { "flake": false, "locked": { @@ -233,11 +213,11 @@ ] }, "locked": { - "lastModified": 1777242021, - "narHash": "sha256-BYew41wJQ8kG71+4eIvStBbmKf++WJnPCh3Lab2jOjw=", + "lastModified": 1780519775, + "narHash": "sha256-u12imjPk4ZhOen/PgnLiNPML+5NmuKO0Ja4wQKU/Y8E=", "owner": "Bali10050", "repo": "Darkly", - "rev": "158eb5afa70c3e2a96ca58a8bc512ae65aecaa4b", + "rev": "11c27e2d98025f4d4c1598f07a185280b36f35f7", "type": "github" }, "original": { @@ -266,11 +246,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1780091591, - "narHash": "sha256-07KVQbmtDbtTU9DlbOQiIXXS+UA+t+/aQ65iY311bSc=", + "lastModified": 1780630679, + "narHash": "sha256-hhQyVAYmNKziZ0T+T4Gsk0PYmnz4vdzOzpkJAmDASKM=", "owner": "cachix", "repo": "devenv", - "rev": "21d68a204558895af93ad82014f8fa83f9c9a51e", + "rev": "90ed6227ab389dd4e874a69a724f25dba312b754", "type": "github" }, "original": { @@ -287,11 +267,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1780049436, - "narHash": "sha256-5AOcWjhcUgzZft6iuZCYqCmCx33C2pXWE+ztxuctJRQ=", + "lastModified": 1780654233, + "narHash": "sha256-F5rHBSjkUyobwPC2IclWO6t91hiKBnuJa0yDfKuUchE=", "owner": "nix-community", "repo": "fenix", - "rev": "9bc51687db8dfb1dd77266deb709c44bafb74ed0", + "rev": "b9e0e5df8f7b4456eb1cad97c435ad0b3e44c669", "type": "github" }, "original": { @@ -541,11 +521,11 @@ ] }, "locked": { - "lastModified": 1780099287, - "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", + "lastModified": 1780679734, + "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", + "rev": "b2b7db486e06e098711dc291bb25db82850e1d16", "type": "github" }, "original": { @@ -612,11 +592,11 @@ ] }, "locked": { - "lastModified": 1780102864, - "narHash": "sha256-OCGIHq5NOglLvVPbUe9ASCHGHOfVjxPdPo+GHL0nOFw=", + "lastModified": 1780708788, + "narHash": "sha256-BaHq9HXksp8OGe0kl6x7IxlyqIWgVQj5qHSaAqhAgDs=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "e1d1790509643d37e66496668262b8a553b54b01", + "rev": "364bfe7a69b3adbfe5c1fedd7a6abf7dd3c79928", "type": "github" }, "original": { @@ -680,11 +660,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1780062130, - "narHash": "sha256-3XF+oy0PX4aajJw2RNB8rlMpyu0eXCG4pGH7fe94yBg=", + "lastModified": 1780694373, + "narHash": "sha256-wuj6QmOlLsGjBOut+Ki/hiOT/H5ONzBePqOkOolsNfo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3cb351d73c357a4e413f59c4551d219118791c14", + "rev": "8f7043c852210cd0875a1bbe9ca872c90ab5ac74", "type": "github" }, "original": { @@ -713,11 +693,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1780056110, - "narHash": "sha256-t7lKVshV/srD0G06j4r5P5qj9zaDeZ9JYFCxHDGROZU=", + "lastModified": 1780637332, + "narHash": "sha256-FeKyLRxLZu2EUnhifijZPDZRl0sVnPVHMtizAINNiN4=", "owner": "YaLTeR", "repo": "niri", - "rev": "f9f43d826ab4014a7c302be28d7da33e12f5be37", + "rev": "f717ae030fe56fc52522ebef69f17f3f09064ac4", "type": "github" }, "original": { @@ -847,11 +827,11 @@ ] }, "locked": { - "lastModified": 1777732699, - "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=", + "lastModified": 1780704078, + "narHash": "sha256-Ktgje3rXwJK3c7nhub8qYgIy/VCYNVrUmIVaaeDhe0E=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5", + "rev": "ad4c358ded144d26da517b999ddb51295770c419", "type": "github" }, "original": { @@ -862,11 +842,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -878,11 +858,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1780112012, - "narHash": "sha256-wKHqNDms2nds3uZD86c7i5VxM9A4Zb+ExqLW3ccblHo=", + "lastModified": 1780711917, + "narHash": "sha256-Cw9useKmvzRyrzQtghZPi56ImYXKsyrh+vo94hCYM3I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "378927e5268efd046eed2aa024095e5ff05f7c7e", + "rev": "f3ce60d5372cbb1490033766bdd4748dc0128e86", "type": "github" }, "original": { @@ -894,11 +874,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1780511130, + "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "535f3e6942cb1cead3929c604320d3db54b542b9", "type": "github" }, "original": { @@ -910,11 +890,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1780104647, - "narHash": "sha256-QsdTqm8CDyl6Eqc8JyKG4LIUQzHukd26AmviPpzXzsU=", + "lastModified": 1780692395, + "narHash": "sha256-dAyK1031bvJZC/MBRl74IvHrOqA915OmD8cdWUa8Ucg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3511a83f14e4def4e1f8cbd2695d0fda1a179428", + "rev": "8e54c6a68fd045814b3650040b48440cd28acf19", "type": "github" }, "original": { @@ -926,11 +906,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -1000,11 +980,11 @@ ] }, "locked": { - "lastModified": 1779766384, - "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "57800b7ab648725ccd33551d01484ee14952ad3f", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -1033,7 +1013,6 @@ "root": { "inputs": { "angrr": "angrr", - "catppuccin": "catppuccin", "darkly": "darkly", "devenv": "devenv", "fenix": "fenix", @@ -1068,11 +1047,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1780002457, - "narHash": "sha256-s2Cmnt3OSjhdaQ68eEhRnIiln+EXNB5Nm8VbsFqM6iE=", + "lastModified": 1780573409, + "narHash": "sha256-Dlru75JzUwjI9d5uiDrN9Rt/wTFVTuqt6QBT+nf2g8U=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "7bd90313c8a444c42b41e295ab8e324be2fa1cf0", + "rev": "aadee11251e6074c9245ac96bc4bfe6eca05a64c", "type": "github" }, "original": { @@ -1148,11 +1127,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1780079634, - "narHash": "sha256-VVyCrzwLitvxZGx48FgzvlbLYGQU99GsaQnZmwqZoUo=", + "lastModified": 1780701809, + "narHash": "sha256-u7AUNs6U6eD1os4+ghbr1gH4QjPWzOdKvpeM+E+XRKM=", "owner": "danth", "repo": "stylix", - "rev": "ca07e0644716a7c13e91c6d92d169fc81889c589", + "rev": "3a02d9f73608641b28e08b26acb0b0b47c05f14b", "type": "github" }, "original": { @@ -1267,11 +1246,11 @@ ] }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", "type": "github" }, "original": { @@ -1345,11 +1324,11 @@ ] }, "locked": { - "lastModified": 1779955179, - "narHash": "sha256-cHrbJ8pZrsFWUTJVk7AxWiEg5eiZptPQxtT0YXMIENo=", + "lastModified": 1780567926, + "narHash": "sha256-LVaiAnBwgr2YotaIlrcwCgmbwHsE2ccegRztLjur/d4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c341e3f6516fb1286d25b99d34b111f93028ae87", + "rev": "eea9ae34eb9011aee9b8ce8ee2bc2dd111ee8285", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d84e59d..cb55384 100644 --- a/flake.nix +++ b/flake.nix @@ -41,10 +41,6 @@ # Useful modules # keep-sorted start block=yes - catppuccin = { - url = "github:catppuccin/nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; impermanence = { url = "github:nix-community/impermanence"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/flake/hosts.nix b/flake/hosts.nix index cc98f65..3c720bc 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -126,7 +126,6 @@ in # Upstream modules # keep-sorted start inputs.angrr.nixosModules.angrr - inputs.catppuccin.nixosModules.catppuccin inputs.home-manager.nixosModules.default inputs.impermanence.nixosModules.impermanence inputs.niri.nixosModules.niri diff --git a/modules/desktop/browser/zen.nix b/modules/desktop/browser/zen.nix index cb73ab0..d0a0e9d 100644 --- a/modules/desktop/browser/zen.nix +++ b/modules/desktop/browser/zen.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - hostname, ... }: let @@ -16,7 +15,7 @@ in config = lib.mkIf cfg.enable { my.hm.programs.zen-browser = { enable = true; - nativeMessagingHosts = [ pkgs.firefoxpwa ]; + nativeMessagingHosts = [ pkgs.master.firefoxpwa ]; policies = { # find more options here: https://mozilla.github.io/policy-templates/ DisableAppUpdate = true; diff --git a/modules/desktop/media/splayer.nix b/modules/desktop/media/splayer.nix index 1fac9dc..fbde1f1 100644 --- a/modules/desktop/media/splayer.nix +++ b/modules/desktop/media/splayer.nix @@ -13,7 +13,9 @@ in }; config = lib.mkIf cfg.enable { - my.hm.home.packages = [ pkgs.splayer ]; + my.hm.home.packages = [ + pkgs.master.splayer + ]; my.persist.homeDirs = [ ".config/SPlayer" ]; diff --git a/modules/desktop/style/default.nix b/modules/desktop/style/default.nix index 999a074..6a94531 100644 --- a/modules/desktop/style/default.nix +++ b/modules/desktop/style/default.nix @@ -14,19 +14,6 @@ in }; config = lib.mkIf cfg.enable { - catppuccin.sddm = { - enable = true; - font = "Jetbrains Mono"; - fontSize = "18"; - }; - services.displayManager.sddm = { - package = pkgs.kdePackages.sddm; - settings.Theme = { - CursorTheme = "breeze-dark"; - CursorSize = 24; - }; - }; - my.hm = { stylix = { enable = true; diff --git a/modules/desktop/style/kdeglobals b/modules/desktop/style/kdeglobals index 6062082..2553061 100644 --- a/modules/desktop/style/kdeglobals +++ b/modules/desktop/style/kdeglobals @@ -114,6 +114,23 @@ Theme=Papirus-Dark contrast=0 frameContrast=0.2 +[KFileDialog Settings] +Allow Expansion=false +Automatically select filename extension=true +Breadcrumb Navigation=true +Decoration position=2 +Show Full Path=false +Show Inline Previews=true +Show Preview=false +Show Speedbar=true +Show hidden files=false +Sort by=Name +Sort directories first=true +Sort hidden files last=false +Sort reversed=false +Speedbar Width=154 +View Style=DetailTree + [WM] activeBackground=34,34,34 activeBlend=255,255,255 diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index 4edc401..1f23a10 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/modules/desktop/wm/niri/default.nix @@ -20,9 +20,11 @@ in package = pkg; }; services.displayManager = { - sddm = { + ly = { enable = true; - wayland.enable = true; + settings = { + animation = "matrix"; + }; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 75ca4b3..179e31d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -20,10 +20,6 @@ in bottles.__input.removeWarningPopup.__assign = true; easytier.__assign = final.stable.easytier; - - openldap.__output.doCheck.__assign = - builtins.warn "doCheck disabled for openldap, check https://github.com/NixOS/nixpkgs/issues/514113" - (!prev.stdenv.hostPlatform.isi686); }; } //