diff --git a/assets/config/KawaDark.colors b/assets/config/KawaDark.colors new file mode 100644 index 0000000..329595f --- /dev/null +++ b/assets/config/KawaDark.colors @@ -0,0 +1,147 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=false +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=250,250,250 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[Colors:Complementary] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=250,250,250 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[Colors:Header] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=250,250,250 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[Colors:Header][Inactive] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=169,169,177 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[Colors:Selection] +BackgroundAlternate=96,69,98 +BackgroundNormal=236,183,213 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=25,16,23 +ForegroundInactive=169,169,177 +ForegroundLink=30,102,245 +ForegroundNegative=176,55,69 +ForegroundNeutral=198,92,0 +ForegroundNormal=25,16,23 +ForegroundPositive=23,104,57 +ForegroundVisited=155,89,182 + +[Colors:Tooltip] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=250,250,250 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[Colors:View] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=250,250,250 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[Colors:Window] +BackgroundAlternate=44,31,45 +BackgroundNormal=25,16,23 +DecorationFocus=236,183,213 +DecorationHover=236,183,213 +ForegroundActive=236,183,213 +ForegroundInactive=169,169,177 +ForegroundLink=137,180,250 +ForegroundNegative=243,139,168 +ForegroundNeutral=249,226,175 +ForegroundNormal=250,250,250 +ForegroundPositive=166,227,161 +ForegroundVisited=245,194,231 + +[General] +ColorScheme=BreezeDark +Name=Kawa Dark +shadeSortColumn=true + +[KDE] +contrast=4 + +[WM] +activeBackground=25,16,23 +activeBlend=25,16,23 +activeForeground=250,250,250 +inactiveBackground=44,31,45 +inactiveBlend=44,31,45 +inactiveForeground=169,169,177 diff --git a/flake.lock b/flake.lock index 02ebca6..58dde1b 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1782648384, - "narHash": "sha256-OlHdAqdXasZk1U+Zf9n+ivqHL9kj/UD0DFO4yYTNBYc=", + "lastModified": 1783674541, + "narHash": "sha256-vmUhEF/jBCZJeK0dInOls+HOAR0yiiQusN1+FZKaJss=", "owner": "catppuccin", "repo": "nix", - "rev": "f2c7dd14ecce785c206a39466cbe227ff62e3803", + "rev": "96799f24cf1366fe88e1293c3d27521a8f2129cf", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1783061223, - "narHash": "sha256-GlYplbaBJ7Nip8XQFhAb2tu4DmtbPrJc1rK2NgL/gw0=", + "lastModified": 1783838629, + "narHash": "sha256-Va46EySvmN/ya+wEgvfLffzHIW19HEiaKJ/zBujm1pQ=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "f3836c9c225cb0a2868f05bf0bc031f20c57c56f", + "rev": "a6af5ef8511d908ff8e9c5bc3f706027132ef74b", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1781761792, - "narHash": "sha256-rCPytmKNjctLloB6UgK5CRrHSwV4b0ygxtJLPPp8R14=", + "lastModified": 1783395956, + "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "a1fa429e945becaf60468600daf649be4ba0350c", + "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1783024095, - "narHash": "sha256-oE+TNK98Pl7nHW4VU1oBvUKD5JR45U+py/NJmLoTNHI=", + "lastModified": 1783823409, + "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4d410db95a6416d1008049330bd86b85b5db45a", + "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", "type": "github" }, "original": { @@ -250,7 +250,7 @@ }, "imnyang_2": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1778582554, @@ -273,11 +273,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1782693511, - "narHash": "sha256-ytACEe0dcb9RgBB4sioGZGzn9H/zhSYI4HE9uXcRgw0=", + "lastModified": 1783532163, + "narHash": "sha256-n+YQKnVt0H1B2z6N1PmaadeVorRHi956q48/g2y8Hnc=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "e58ead4df900a4391ee1e6a7efe9294d6283aeb3", + "rev": "3623ed0ed9f6065ce666cb0276ff0b903fee2355", "type": "github" }, "original": { @@ -290,17 +290,17 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1782175707, - "narHash": "sha256-nAgnski2c247PqLtcK3g5NER7hVj/zlCJd9CTb2lne4=", + "lastModified": 1783268941, + "narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "5729ba4bb432a071a0276abb416b2c26d27afa71", + "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "5729ba4bb432a071a0276abb416b2c26d27afa71", + "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "type": "github" } }, @@ -328,11 +328,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1782537345, - "narHash": "sha256-8yBe/CYAwp0zWLLat/q8QfEoxql4YXnvFLNYHMVjUpc=", + "lastModified": 1783821302, + "narHash": "sha256-yrlsrPvCUBUS6minT8VBMemHa47qzXRcHdzvYzRTSTo=", "owner": "imnyang", "repo": "muvel-nix", - "rev": "cc57a70965daeece70b4a0f285c5952b37fa119b", + "rev": "90f3b4f37c57d0c73dfd4131c6d190147654e1df", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1780908363, - "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=", + "lastModified": 1783368811, + "narHash": "sha256-0H8jDwR4Kegb3heaTrH1ftbgKfZVDT8JE+46uXxDy/Q=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809", + "rev": "20d42f0ee98c9fe9f85e8d1de474f1409ed10d05", "type": "github" }, "original": { @@ -382,11 +382,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1783050870, - "narHash": "sha256-3UtkNMi6zt972zKyE5Qt9LkSHn6sbz1AjVRNvX+SZlE=", + "lastModified": 1783764089, + "narHash": "sha256-AzoohteEEymQ+m3fAXlQJ+mkFLQ9XjPRqSlgqJ7TLGY=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "1e24eefaa5ee1927a3b1bae9b3e2f3caf3fae9f3", + "rev": "f3c556542c423b5e790a94d0337a80cede816620", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1781182279, - "narHash": "sha256-V5EQQbDnmdiXGQXrEF1PEL7QYsFqfH8N1E89Z5ONwFk=", + "lastModified": 1783336371, + "narHash": "sha256-ZisTtweyb7JUwPP54HAXE9TypT8m89dIxDI36Ak0hAs=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5675822ba756e6e56f8f6a5a76e90e0da2ece94d", + "rev": "a9620cfa43f0c1c30a46c31ae3c6e58cdb124a14", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782175435, - "narHash": "sha256-8d2wCNWKnd86GzKZvbuqqlS+HqMrheXkvRf0qGJ/oA0=", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "lastModified": 1783279667, + "narHash": "sha256-2l8yOB5aYd+05Q9V9Y1YhgbSa1j1o5QX+nvYs5FL80A=", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1020805.89570f24e97e/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1028110.f205b5574fd0/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -446,11 +446,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -459,13 +459,29 @@ "type": "github" } }, - "nixpkgs-nixcord": { + "nixpkgs-libxml2": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-nixcord": { + "locked": { + "lastModified": 1782999065, + "narHash": "sha256-5Dgj5+pIQYZKrXUGaLCk7CKfN3MmpwIhO94++WVxvng=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "80d591ed473cfc46329932c2aadac9b435342c7c", "type": "github" }, "original": { @@ -509,11 +525,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1782467914, - "narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", - "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "lastModified": 1783776592, + "narHash": "sha256-+GVwKnbbSmf4cWMJyRzvw8H5yFknmkLoPD5v6snqPzo=", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1032869.e7a3ca8092b6/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -537,6 +553,22 @@ } }, "nixpkgs_14": { + "locked": { + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { "locked": { "lastModified": 1777954456, "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", @@ -618,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { @@ -634,11 +666,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1782999065, + "narHash": "sha256-5Dgj5+pIQYZKrXUGaLCk7CKfN3MmpwIhO94++WVxvng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "80d591ed473cfc46329932c2aadac9b435342c7c", "type": "github" }, "original": { @@ -666,11 +698,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -749,11 +781,11 @@ ] }, "locked": { - "lastModified": 1775856943, - "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", + "lastModified": 1783574839, + "narHash": "sha256-ICof1tV4/9XheBLBGf7dhMhfMq4dOs1zwTHrr7zGFlA=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", + "rev": "c551f0687658e4bb699cfff6015436ad7ee57a0d", "type": "github" }, "original": { @@ -833,11 +865,11 @@ ] }, "locked": { - "lastModified": 1782165805, - "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { @@ -846,17 +878,36 @@ "type": "github" } }, + "soulver-cpp": { + "inputs": { + "nixpkgs": "nixpkgs_14", + "nixpkgs-libxml2": "nixpkgs-libxml2" + }, + "locked": { + "lastModified": 1783621734, + "narHash": "sha256-YBFO+aurlz2y2hTRN1Kl0RjX6JzHn0mYBmt4zb436Yg=", + "owner": "vicinaehq", + "repo": "soulver-cpp", + "rev": "00e926e2bd03118638c88981f6a67bfa107210c2", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "soulver-cpp", + "type": "github" + } + }, "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_12", "systems": "systems_5" }, "locked": { - "lastModified": 1782898510, - "narHash": "sha256-7QVN7ijsXbIBRrI9LdXfeoFktTS0I6HZya9tu6+STrs=", + "lastModified": 1783838433, + "narHash": "sha256-Zb8+v76qSPYDlUea1y30YzgdEoDjA97vRmeqfPAqwZs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "9cabea6f5973ec01f60080ea50f54f8f6d74dc95", + "rev": "c6ab7371e40abd405313af9bddafd5f37cc94f83", "type": "github" }, "original": { @@ -973,14 +1024,15 @@ "vicinae": { "inputs": { "nixpkgs": "nixpkgs_13", + "soulver-cpp": "soulver-cpp", "systems": "systems_6" }, "locked": { - "lastModified": 1783040721, - "narHash": "sha256-9mj0DI9/QxmBTpydeCYHAJTqLoTMmDS0wZuh2EXoVHY=", + "lastModified": 1783794047, + "narHash": "sha256-TOV9S62H66hItUcsjaGcmjknCqZJ/gN7EPRmwS7jh9w=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "220af6e5e14f1ff692a258547afab8a88039c60c", + "rev": "e7e34695371737b371d6488c7f680b436d82093e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 24d83cb..1dfc4e6 100644 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,13 @@ inputs.millennium.overlays.default (import ./overlays/spotx.nix) (final: prev: { + vulkan-validation-layers = prev.vulkan-validation-layers.overrideAttrs (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + # Fixed upstream; keep this until the locked nixpkgs includes it. + "-DUPDATE_DEPS=OFF" + ]; + }); + pythonPackagesExtensions = (prev.pythonPackagesExtensions or [ ]) ++ [ (python-final: python-prev: { uefi-firmware-parser = python-prev.uefi-firmware-parser.overridePythonAttrs (old: { diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix index e996624..9335055 100644 --- a/hosts/installer/default.nix +++ b/hosts/installer/default.nix @@ -3,7 +3,11 @@ overlays, }: let - inherit (inputs) nixpkgs; + inherit (inputs) + nixpkgs + home-manager + plasma-manager + ; in nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -13,6 +17,18 @@ nixpkgs.lib.nixosSystem { "${inputs.self}/modules/mizukios/base" + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.nixos = import ./home.nix; + home-manager.sharedModules = [ + plasma-manager.homeModules.plasma-manager + ]; + } + ({ pkgs, ... }: { environment.systemPackages = with pkgs; [ fastfetch @@ -27,6 +43,10 @@ nixpkgs.lib.nixosSystem { security.sudo.enable = false; + users.users.nixos = { + shell = pkgs.fish; + }; + environment.etc.flake.source = "${inputs.self}"; }) ]; diff --git a/hosts/installer/home.nix b/hosts/installer/home.nix new file mode 100644 index 0000000..92aa5b5 --- /dev/null +++ b/hosts/installer/home.nix @@ -0,0 +1,18 @@ +{ inputs, ... }: + +{ + xdg.enable = true; + + home.stateVersion = "25.11"; + home.username = "nixos"; + home.homeDirectory = "/home/nixos"; + + imports = [ + "${inputs.self}/modules/home/devtool/ghostty.nix" + "${inputs.self}/modules/home/devtool/zed.nix" + "${inputs.self}/modules/home/fastfetch.nix" + "${inputs.self}/modules/home/devtool/neovim.nix" + ./plasma.nix + ./shell.nix + ]; +} diff --git a/hosts/installer/plasma.nix b/hosts/installer/plasma.nix new file mode 100644 index 0000000..1a7fd6f --- /dev/null +++ b/hosts/installer/plasma.nix @@ -0,0 +1,13 @@ +{ inputs, lib, ... }: +let + assets = "${inputs.self}/assets"; +in +{ + imports = [ "${inputs.self}/modules/home/plasma.nix" ]; + + programs.plasma.workspace.cursor = { + theme = "pjsk-cursor-n25-mizuki-ani"; + }; + + programs.plasma.workspace.colorScheme = lib.mkForce "Kawa"; +} diff --git a/hosts/installer/shell.nix b/hosts/installer/shell.nix new file mode 100644 index 0000000..2cf6319 --- /dev/null +++ b/hosts/installer/shell.nix @@ -0,0 +1,54 @@ +{ + programs.fish = { + enable = true; + + shellAliases = { + ".." = "cd .."; + "..." = "cd ../.."; + + ls = "eza --icons=always"; + ll = "eza --icons=always -l"; + la = "eza --icons=always -a"; + lla = "eza --icons=always -la"; + + cat = "bat --plain"; + + clean = "sudo nix-collect-garbage -d"; + }; + + interactiveShellInit = '' + set -g fish_greeting "" + set -g fish_color_command blue + set -g fish_color_error red + set -g fish_color_param cyan + ''; + }; + + programs.starship = { + enable = true; + settings = { + format = "🦔 $directory:$character"; + add_newline = false; + # username = { + # style_user = "purple"; + # style_root = "purple"; + # format = "[$user]($style)"; + # show_always = true; + # }; + # hostname = { + # style = "green"; + # format = "[$hostname]($style)"; + # ssh_only = false; + # }; + directory = { + style = "fg:#fbb6c4"; + format = "[$path]($style)"; + truncation_length = 3; + }; + character = { + success_symbol = " 💕"; + error_symbol = " ⚠️"; + }; + }; + }; +} diff --git a/hosts/machine/ena/configuration.nix b/hosts/machine/ena/configuration.nix index c26d155..97ba92a 100644 --- a/hosts/machine/ena/configuration.nix +++ b/hosts/machine/ena/configuration.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, inputs, ... }: @@ -26,16 +27,14 @@ "${inputs.self}/modules/mizukios/features/remote/ssh.nix" ]; + catppuccin.flavor = lib.mkForce "mocha"; + networking = { hostName = "ena"; networkmanager.enable = true; firewall.enable = false; }; - networking.networkmanager.plugins = [ - pkgs.networkmanager-ssh - ]; - services.printing.enable = true; services.power-profiles-daemon.enable = true; services.asusd.enable = true; diff --git a/hosts/machine/ena/home/config/plasma.nix b/hosts/machine/ena/home/config/plasma.nix index 85a6f65..3fd9b62 100644 --- a/hosts/machine/ena/home/config/plasma.nix +++ b/hosts/machine/ena/home/config/plasma.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, lib, ... }: let assets = "${inputs.self}/assets"; in @@ -9,6 +9,8 @@ in theme = "pjsk-cursor-n25-ena-ani"; }; + programs.plasma.workspace.colorScheme = lib.mkForce "KawaDark"; + programs.plasma.workspace.wallpaper = "${assets}/wallpaper/wallpaper1.jpg"; programs.plasma.kscreenlocker.appearance.wallpaper = "${assets}/wallpaper/wallpaper3.png"; diff --git a/hosts/machine/ena/home/default.nix b/hosts/machine/ena/home/default.nix index 5aaa397..d4e8116 100644 --- a/hosts/machine/ena/home/default.nix +++ b/hosts/machine/ena/home/default.nix @@ -20,17 +20,6 @@ xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true; - programs.vicinae = { - enable = true; - systemd = { - enable = true; - autoStart = true; - environment = { - USE_LAYER_SHELL = 1; - }; - }; - }; - imports = [ "${inputs.self}/modules/home/devtool/git.nix" "${inputs.self}/modules/home/devtool/neovim.nix" @@ -40,6 +29,9 @@ "${inputs.self}/modules/home/discord/linux.nix" "${inputs.self}/modules/home/devtool/vscode.nix" "${inputs.self}/modules/home/devtool/ciscopackettracer.nix" + "${inputs.self}/modules/home/ssh.nix" + "${inputs.self}/modules/home/vicinae.nix" + ./config/shell.nix ./config/plasma.nix ]; diff --git a/hosts/machine/mafuyu/configuration.nix b/hosts/machine/mafuyu/configuration.nix index f6a94d6..09e6d4d 100644 --- a/hosts/machine/mafuyu/configuration.nix +++ b/hosts/machine/mafuyu/configuration.nix @@ -23,6 +23,19 @@ services.caddy = { enable = true; + virtualHosts."broadcast.epc.mizuki.guru".extraConfig = '' + @authApi path /api/auth /api/auth/* + handle @authApi { + reverse_proxy 127.0.0.1:1234 + } + + @backendApi path /api /api/* + handle @backendApi { + reverse_proxy 127.0.0.1:1108 + } + + reverse_proxy 127.0.0.1:1234 + ''; virtualHosts."http://broadcast.epc.mizuki.arpa".extraConfig = '' @preflight method OPTIONS @@ -36,6 +49,19 @@ reverse_proxy 127.0.0.1:6769 ''; + virtualHosts."https://broadcast.epc.mizuki.guru:30427".extraConfig = '' + @preflight method OPTIONS + + header { + Access-Control-Allow-Origin * + Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS" + Access-Control-Allow-Headers * + } + + respond @preflight "" 204 + + reverse_proxy 127.0.0.1:6769 + ''; virtualHosts."http://broadcast.epc.mizuki.arpa:8027".extraConfig = '' @preflight method OPTIONS diff --git a/hosts/machine/mizuki/home/default.nix b/hosts/machine/mizuki/home/default.nix index 175c2a7..fe57254 100644 --- a/hosts/machine/mizuki/home/default.nix +++ b/hosts/machine/mizuki/home/default.nix @@ -18,30 +18,6 @@ VISUAL = "nvim"; }; - programs.ssh = { - enable = true; - matchBlocks = { - "*" = { - forwardAgent = false; - identityAgent = "~/.1password/agent.sock"; - setEnv = { - TERM = "xterm-256color"; - }; - extraOptions = { - ServerAliveInterval = "0"; - ServerAliveCountMax = "3"; - Compression = "no"; - AddKeysToAgent = "no"; - HashKnownHosts = "no"; - UserKnownHostsFile = "~/.ssh/known_hosts"; - ControlMaster = "no"; - ControlPath = "~/.ssh/master-%r@%n:%p"; - ControlPersist = "no"; - }; - }; - }; - }; - xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true; imports = [ @@ -58,5 +34,6 @@ "${inputs.self}/modules/home/obs-studio.nix" "${inputs.self}/modules/home/devtool/vscode.nix" "${inputs.self}/modules/home/devtool/ciscopackettracer.nix" + "${inputs.self}/modules/home/ssh.nix" ]; } diff --git a/modules/home/devtool/ghostty.nix b/modules/home/devtool/ghostty.nix index 2aeba40..2c95aa9 100644 --- a/modules/home/devtool/ghostty.nix +++ b/modules/home/devtool/ghostty.nix @@ -1,35 +1,12 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.ghostty = { enable = true; package = if pkgs.stdenv.isDarwin then pkgs.ghostty-bin else pkgs.ghostty; enableFishIntegration = true; - settings = { - background = "#fcf8f9"; - foreground = "#191017"; - - cursor-color = "#301d23"; - selection-background = "#f4ecee"; - selection-foreground = "#191017"; - palette = [ - "0=#5c5f77" - "1=#d20f39" - "2=#40a02b" - "3=#df8e1d" - "4=#1e66f5" - "5=#ea76cb" - "6=#179299" - "7=#acb0be" - "8=#6c6f85" - "9=#d20f39" - "10=#40a02b" - "11=#df8e1d" - "12=#1e66f5" - "13=#ea76cb" - "14=#179299" - "15=#bcc0cc" - ]; + settings = { + theme = "light:Mizuki Light,dark:Mizuki Dark"; window-colorspace = "srgb"; window-theme = "ghostty"; @@ -46,4 +23,56 @@ auto-update = "off"; }; }; + + xdg.configFile."ghostty/themes/Mizuki Light".text = '' + background = #fcf8f9 + foreground = #191017 + + cursor-color = #301d23 + selection-background = #f4ecee + selection-foreground = #191017 + + palette = 0=#5c5f77 + palette = 1=#d20f39 + palette = 2=#40a02b + palette = 3=#df8e1d + palette = 4=#1e66f5 + palette = 5=#ea76cb + palette = 6=#179299 + palette = 7=#acb0be + palette = 8=#6c6f85 + palette = 9=#d20f39 + palette = 10=#40a02b + palette = 11=#df8e1d + palette = 12=#1e66f5 + palette = 13=#ea76cb + palette = 14=#179299 + palette = 15=#bcc0cc + ''; + + xdg.configFile."ghostty/themes/Mizuki Dark".text = '' + background = #191017 + foreground = #fafafa + + cursor-color = #fafafa + selection-background = #2c1f2d + selection-foreground = #fafafa + + palette = 0=#5c5f77 + palette = 1=#f38ba8 + palette = 2=#a6e3a1 + palette = 3=#f9e2af + palette = 4=#89b4fa + palette = 5=#f5c2e7 + palette = 6=#94e2d5 + palette = 7=#bac2de + palette = 8=#6c7086 + palette = 9=#f38ba8 + palette = 10=#a6e3a1 + palette = 11=#f9e2af + palette = 12=#89b4fa + palette = 13=#f5c2e7 + palette = 14=#94e2d5 + palette = 15=#cdd6f4 + ''; } diff --git a/modules/home/devtool/vscode.nix b/modules/home/devtool/vscode.nix index 28e9efc..32db880 100644 --- a/modules/home/devtool/vscode.nix +++ b/modules/home/devtool/vscode.nix @@ -29,7 +29,7 @@ in src = builtins.fetchTarball { url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64"; - sha256 = "1vzf897inlzxfwmnaykkj3gqg18wbh9zhv7lnh3if6agixv0v91b"; + sha256 = "0j21dnn1kj7gazyqiz9ip6qvpzi1zva33mf5l18ljv3sn34jgyzw"; }; buildInputs = oldAttrs.buildInputs ++ [ diff --git a/modules/home/devtool/zed.nix b/modules/home/devtool/zed.nix index dbe252e..c3e65c5 100644 --- a/modules/home/devtool/zed.nix +++ b/modules/home/devtool/zed.nix @@ -16,7 +16,7 @@ "buffer_font_size" = 15; "theme" = { - "mode" = "light"; + "mode" = "system"; "light" = "One Light"; "dark" = "One Dark"; }; @@ -28,7 +28,6 @@ "title_bar.background" = "#FDF7F9"; "elevated_surface.background" = "#FDF7F9"; - # 핵심: sidebar/project panel 쪽은 투명 제거 "surface.background" = "#FDF7F9"; "panel.background" = "#FDF7F9"; "editor.gutter.background" = "#FDF7F9"; @@ -36,7 +35,6 @@ "toolbar.background" = "#FDF7F9"; "terminal.background" = "#FDF7F9"; - # editor만 투명 유지하고 싶으면 이건 남겨도 됨 "editor.background" = "#00000000"; "editor.line_number" = "#A38F96"; @@ -69,6 +67,56 @@ "drop_target.background" = "#8165701a"; "editor.highlighted_line.background" = "#8165701a"; }; + + "One Dark" = { + "background" = "#191017"; + "status_bar.background" = "#191017"; + "title_bar.background" = "#191017"; + "elevated_surface.background" = "#191017"; + + "surface.background" = "#191017"; + "panel.background" = "#191017"; + "editor.gutter.background" = "#191017"; + "tab_bar.background" = "#191017"; + "toolbar.background" = "#191017"; + "terminal.background" = "#191017"; + + "editor.background" = "#00000000"; + + "editor.foreground" = "#FAFAFA"; + "text" = "#FAFAFA"; + "text.muted" = "#A9A9B1"; + "editor.line_number" = "#A38F96"; + "editor.active_line_number" = "#FAFAFA"; + + "border" = "#2C1F2D"; + "hint.background" = "#2C1F2D"; + + "tab.active_background" = "#2C1F2D"; + "tab.inactive_background" = "#191017"; + "element.selected" = "#2C1F2D"; + "element.active" = "#2C1F2D99"; + "element.hover" = "#2C1F2D80"; + + "editor.indent_guide" = "#2C1F2D"; + "editor.indent_guide_active" = "#4A354C"; + "panel.indent_guide" = "#2C1F2D"; + "panel.indent_guide_hover" = "#4A354C"; + "panel.indent_guide_active" = "#604562"; + + "panel.focused_border" = "#00000000"; + "border.variant" = "#00000000"; + "scrollbar.track.border" = "#00000000"; + "editor.active_line.background" = "#2C1F2D66"; + "scrollbar.track.background" = "#00000000"; + "scrollbar.thumb.background" = "#A38F9680"; + "ghost_element.background" = "#00000000"; + "ghost_element.hover" = "#2C1F2D80"; + "ghost_element.active" = "#2C1F2D99"; + "ghost_element.selected" = "#2C1F2DCC"; + "drop_target.background" = "#2C1F2D99"; + "editor.highlighted_line.background" = "#2C1F2D99"; + }; }; }; }; diff --git a/modules/home/obs-studio.nix b/modules/home/obs-studio.nix index 7e1b664..7053811 100644 --- a/modules/home/obs-studio.nix +++ b/modules/home/obs-studio.nix @@ -1,15 +1,17 @@ { pkgs, ... }: let - obs-wrapped = (pkgs.obs-studio.override { - cudaSupport = true; - }).overrideAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.makeWrapper ]; - postInstall = (old.postInstall or "") + '' - wrapProgram $out/bin/obs \ - --set QT_QPA_PLATFORM xcb \ - --set GS_DEVICE_TYPE opengl - ''; - }); + obs-wrapped = + (pkgs.obs-studio.override { + cudaSupport = true; + }).overrideAttrs + (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ]; + postInstall = (old.postInstall or "") + '' + wrapProgram $out/bin/obs \ + --set QT_QPA_PLATFORM xcb \ + --set GS_DEVICE_TYPE opengl + ''; + }); in { programs.obs-studio = { @@ -23,6 +25,7 @@ in obs-gstreamer obs-vkcapture obs-move-transition + advanced-scene-switcher ]; }; -} \ No newline at end of file +} diff --git a/modules/home/plasma.nix b/modules/home/plasma.nix index 8c23a9a..a160e5a 100644 --- a/modules/home/plasma.nix +++ b/modules/home/plasma.nix @@ -8,6 +8,7 @@ let in { home.file.".local/share/color-schemes/Kawa.colors".source = "${assets}/config/Kawa.colors"; + home.file.".local/share/color-schemes/KawaDark.colors".source = "${assets}/config/KawaDark.colors"; home.file.".config/autostart/1password.desktop".source = "${assets}/config/1password.desktop"; programs.plasma = { diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix new file mode 100644 index 0000000..1175cdc --- /dev/null +++ b/modules/home/ssh.nix @@ -0,0 +1,25 @@ +{ ... }: { + programs.ssh = { + enable = true; + matchBlocks = { + "*" = { + forwardAgent = false; + identityAgent = "~/.1password/agent.sock"; + setEnv = { + TERM = "xterm-256color"; + }; + extraOptions = { + ServerAliveInterval = "0"; + ServerAliveCountMax = "3"; + Compression = "no"; + AddKeysToAgent = "no"; + HashKnownHosts = "no"; + UserKnownHostsFile = "~/.ssh/known_hosts"; + ControlMaster = "no"; + ControlPath = "~/.ssh/master-%r@%n:%p"; + ControlPersist = "no"; + }; + }; + }; + }; +} diff --git a/modules/mizukios/features/catppuccin.nix b/modules/mizukios/features/catppuccin.nix index 60f1af5..e5c72e0 100644 --- a/modules/mizukios/features/catppuccin.nix +++ b/modules/mizukios/features/catppuccin.nix @@ -1,9 +1,9 @@ { pkgs, ... }: { - catppuccin.enable = true; - catppuccin.flavor = "latte"; - catppuccin.autoEnable = false; catppuccin = { + enable = true; + flavor = "latte"; + autoEnable = false; cache.enable = true; cursors.enable = false; fcitx5.enable = true;