diff --git a/flake.lock b/flake.lock index e491b4c..80d90dd 100644 --- a/flake.lock +++ b/flake.lock @@ -1,56 +1,69 @@ { "nodes": { - "aquamarine": { + "base16": { "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "aquamarine", + "owner": "SenchoPens", + "repo": "base16.nix", "type": "github" } }, - "chinese-fonts-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, + "base16-fish": { + "flake": false, "locked": { - "lastModified": 1735891296, - "narHash": "sha256-xmyzX5JXC1JQNVNhI8AnbivcID2AJoCQXlSKxRxsMt0=", - "owner": "brsvh", - "repo": "chinese-fonts-overlay", - "rev": "748d91262ab205d069d5a40275f079ed70b71994", + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", "type": "github" }, "original": { - "owner": "brsvh", - "ref": "main", - "repo": "chinese-fonts-overlay", + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -75,23 +88,23 @@ "type": "github" } }, - "flake-compat": { + "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "lastModified": 1743774811, + "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", "type": "github" } }, - "flake-compat_2": { + "flake-compat": { "flake": false, "locked": { "lastModified": 1717312683, @@ -107,6 +120,21 @@ "type": "github" } }, + "flake-compat_2": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_3": { "flake": false, "locked": { @@ -139,9 +167,31 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -159,7 +209,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -176,6 +226,27 @@ } }, "flake-utils_3": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -193,7 +264,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_5" }, @@ -211,7 +282,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { "systems": "systems_6" }, @@ -229,14 +300,50 @@ "type": "github" } }, - "gitignore": { + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "git-hooks": { "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_2", "nixpkgs": [ - "hyprland", - "pre-commit-hooks", + "stylix", "nixpkgs" ] }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "flake": false, "locked": { "lastModified": 1709087332, "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", @@ -252,7 +359,13 @@ } }, "gitignore_2": { - "flake": false, + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, "locked": { "lastModified": 1709087332, "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", @@ -288,6 +401,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "47.2", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -309,310 +439,24 @@ "type": "github" } }, - "hosts": { + "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1744900124, - "narHash": "sha256-2l+0DOQkro1XqokQCQYJVy0RLULxLvRdfd+KLvx2E+I=", - "owner": "StevenBlack", - "repo": "hosts", - "rev": "8c73d7423883d1e9992eb74aabc17f0780b65c8b", - "type": "github" - }, - "original": { - "owner": "StevenBlack", - "repo": "hosts", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], "nixpkgs": [ - "hyprland", + "stylix", "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "lastModified": 1744637364, + "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "337541447773985f825512afd0f9821a975186be", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1743953322, - "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1745164468, - "narHash": "sha256-JOza51SDXsdHIuIR40wdFTzjZdSIq8RwFpCacDNURgk=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "9b4060f09be06250e859b27d6dd3ded5349f5546", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745156469, - "narHash": "sha256-3PK27C3XcPoOkEIQnaPi3cdvh7XjIGqkcQ6MeZMvy2E=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "faa4e782753ab994333666b7e686b038d420c22f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "owner": "nix-community", + "repo": "home-manager", "type": "github" } }, @@ -692,8 +536,8 @@ "nix-options-search": { "inputs": { "flake-utils": "flake-utils_2", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3" + "gitignore": "gitignore", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1743876182, @@ -711,7 +555,7 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], @@ -734,14 +578,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", - "path": "/nix/store/inbabfz8n7fxflkis0a05zcli4a1q2bp-source", - "type": "path" + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -776,38 +624,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1744932701, "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", @@ -822,7 +638,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -838,7 +654,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -854,45 +670,42 @@ "type": "github" } }, - "pre-commit-hooks": { + "nur": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", + "flake-parts": "flake-parts", "nixpkgs": [ - "hyprland", + "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "lastModified": 1743884191, + "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "owner": "nix-community", + "repo": "NUR", + "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, "root": { "inputs": { - "chinese-fonts-overlay": "chinese-fonts-overlay", "darwin": "darwin", "home-manager": "home-manager", - "hosts": "hosts", - "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", "moonlight": "moonlight", "nh": "nh", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2", + "stylix": "stylix", "zig": "zig", "zls": "zls" } @@ -938,18 +751,55 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "git-hooks": "git-hooks", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_3", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1745197327, + "narHash": "sha256-67BDvZBfS+IGM/onh7FgjSo1B+oeh6tewDCFvwrDzvs=", + "owner": "danth", + "repo": "stylix", + "rev": "039e938b29ce870ba326be1d60ae6d7c0a58f84e", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1028,52 +878,115 @@ "type": "github" } }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, + "tinted-foot": { + "flake": false, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1742851696, + "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1743296873, + "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } }, "zig": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1744978344, @@ -1092,7 +1005,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -1114,10 +1027,10 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_3", "langref": "langref", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index ea46e4e..a67a1f2 100644 --- a/flake.nix +++ b/flake.nix @@ -18,21 +18,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hosts = { - url = "github:StevenBlack/hosts"; - #flake = false; - }; - - hyprland.url = "github:hyprwm/Hyprland"; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - #flake = false; - }; - zig.url = "github:mitchellh/zig-overlay"; zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b"; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + moonlight = { url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. inputs.nixpkgs.follows = "nixpkgs"; @@ -52,11 +45,6 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - - chinese-fonts-overlay = { - url = "github:brsvh/chinese-fonts-overlay/main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { nixpkgs, @@ -68,8 +56,20 @@ overlays = [ inputs.zig.overlays.default inputs.rust-overlay.overlays.default - inputs.chinese-fonts-overlay.overlays.default inputs.nh.overlays.default + #Signal desktop decided to break bc of being outdated on macos :( + ( + final: prev: { + signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (old: { + version = "7.51.0"; + + src = prev.fetchurl { + url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-7.51.0.dmg"; + hash = "sha256-dUcBvKbGVsEUxOSv8u/jjuvYjHar2+zbv+/ZRS85w1w="; + }; + }); + } + ) ]; # ----- USER SETTINGS ----- # @@ -78,13 +78,17 @@ name = "Natalie"; # name/identifier email = "nmarks413@gmail.com"; # email (used for certain configurations) dotfilesDir = "~/.dotfiles"; # absolute path of the local repo + theme = "catpuccin-mocha"; #name of theme that stylix will use browser = "firefox"; # Default browser; must select one from ./user/app/browser/ term = "ghostty"; # Default terminal command; - font = "iosevka Nerd Font"; # Selected font + font = "iosevka"; # Selected font editor = "neovim"; # Default editor; spawnEditor = "exec" + term + " -e " + editor; timeZone = "America/Los_Angeles"; sexuality = "bisexual"; + + darwinHost = "laptop"; + nixosHost = "desktop"; }; mkSystem = import ./lib/mkSystem.nix { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 658e2ba..9e2b9fe 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -1,7 +1,4 @@ { - self, - inputs, - config, pkgs, userSettings, ... diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index ddbb9c0..969c9f5 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,25 +1,12 @@ -{ - inputs, - config, - pkgs, - lib, - userSettings, - ... -}: { +{pkgs, ...}: { imports = [ - # ../../modules/macos/icons.nix ../../modules/macos/homebrew.nix ]; - environment.systemPackages = with pkgs; - [ - neovim - pinentry_mac - ] - ++ callPackage ../shared/packages.nix {}; - - # Use a custom configuration.nix location. - #environment.darwinConfig = "$HOME/.dotfiles/hosts/laptop"; + environment.systemPackages = with pkgs; [ + neovim + pinentry_mac + ]; # Create /etc/zshrc that loads the nix-darwin environment. programs = { diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 5c76af0..24651f3 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -4,7 +4,6 @@ pkgs, lib, userSettings, - systemSettings, ... }: { programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib userSettings;}; @@ -15,7 +14,7 @@ # shell = pkgs.fish; stateVersion = "23.05"; # Please read the comment before changing. - # packages = pkgs.callPackage ../shared/packages.nix {}; + packages = pkgs.callPackage ../shared/packages.nix {}; sessionPath = [ "$HOME/.emacs.d/bin" diff --git a/hosts/laptop/icons/.DS_Store b/hosts/laptop/icons/.DS_Store deleted file mode 100644 index 2625ed3..0000000 Binary files a/hosts/laptop/icons/.DS_Store and /dev/null differ diff --git a/hosts/laptop/icons/Zen_icons/Zen Browser - Dark Mono.icns b/hosts/laptop/icons/Zen_icons/Zen Browser - Dark Mono.icns deleted file mode 100644 index 7fdfe63..0000000 Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Dark Mono.icns and /dev/null differ diff --git a/hosts/laptop/icons/Zen_icons/Zen Browser - Dark.icns b/hosts/laptop/icons/Zen_icons/Zen Browser - Dark.icns deleted file mode 100644 index 0018099..0000000 Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Dark.icns and /dev/null differ diff --git a/hosts/laptop/icons/Zen_icons/Zen Browser - Inverted.icns b/hosts/laptop/icons/Zen_icons/Zen Browser - Inverted.icns deleted file mode 100644 index d41cd7a..0000000 Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Inverted.icns and /dev/null differ diff --git a/hosts/laptop/icons/Zen_icons/Zen Browser - Light Mono.icns b/hosts/laptop/icons/Zen_icons/Zen Browser - Light Mono.icns deleted file mode 100644 index 9549c11..0000000 Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Light Mono.icns and /dev/null differ diff --git a/hosts/laptop/icons/Zen_icons/Zen Browser - Light.icns b/hosts/laptop/icons/Zen_icons/Zen Browser - Light.icns deleted file mode 100644 index f16418d..0000000 Binary files a/hosts/laptop/icons/Zen_icons/Zen Browser - Light.icns and /dev/null differ diff --git a/hosts/laptop/icons/Zen_icons/firefox.icns b/hosts/laptop/icons/Zen_icons/firefox.icns deleted file mode 100644 index b8e4a15..0000000 Binary files a/hosts/laptop/icons/Zen_icons/firefox.icns and /dev/null differ diff --git a/hosts/shared/home-programs.nix b/hosts/shared/home-programs.nix index 8e6f0f6..c0a692f 100644 --- a/hosts/shared/home-programs.nix +++ b/hosts/shared/home-programs.nix @@ -1,8 +1,5 @@ { - inputs, - config, pkgs, - lib, userSettings, ... }: { @@ -32,20 +29,6 @@ bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat]; - config = { - theme = "catpuccin"; - }; - themes = { - catpuccin = { - src = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; - hash = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI="; - rev = "699f60fc8ec434574ca7451b444b880430319941"; - }; - file = "themes/Catppuccin Mocha.tmTheme"; - }; - }; }; hyfetch = { @@ -59,13 +42,7 @@ }; color_align = { mode = "horizontal"; - # custom_colors = []; - # fore_back = null; }; - distro = "nixos"; - pride_month_shown = [ - ]; - pride_month_disable = false; }; }; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 64f05b2..7b97346 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -10,27 +10,21 @@ darwin ? false, extraModules ? [], }: let - # userSettings = rec { - # username = "nmarks"; # username - # name = "Natalie"; # name/identifier - # email = "nmarks413@gmail.com"; # email (used for certain configurations) - # dotfilesDir = "~/.dotfiles"; # absolute path of the local repo - # browser = "firefox"; # Default browser; must select one from ./user/app/browser/ - # term = "ghostty"; # Default terminal command; - # font = "iosevka Nerd Font"; # Selected font - # editor = "neovim"; # Default editor; - # spawnEditor = "exec" + term + "- e " + editor; - # }; nixindex = if darwin then inputs.nix-index-database.darwinModules.nix-index else inputs.nix-index-database.nixosModules.nix-index; + stylix = + if darwin + then inputs.stylix.darwinModules.stylix + else inputs.stylix.nixosModules.stylix; + systemSettings = rec { host = if darwin - then "laptop" - else "desktop"; + then userSettings.darwinHost + else userSettings.nixosHost; # The config files for this system. @@ -71,9 +65,17 @@ in ../modules/shared/extras.nix ../modules/shared/nix.nix + # Link to config.nix hostConfig + + #Set up nix-index and enable comma for easy one-shot command use + #https://github.com/nix-community/comma nixindex {programs.nix-index-database.comma.enable = true;} + + #style programs + stylix + hmModules.home-manager { home-manager = { @@ -99,5 +101,6 @@ in }; } ] + #Add extra modules depending on system ++ extraModules; } diff --git a/modules/macos/homebrew.nix b/modules/macos/homebrew.nix index 41ec9e1..35631f7 100644 --- a/modules/macos/homebrew.nix +++ b/modules/macos/homebrew.nix @@ -1,10 +1,4 @@ -{ - inputs, - config, - lib, - pkgs, - ... -}: { +_: { # Use homebrew to install casks and Mac App Store apps homebrew = { enable = true; @@ -15,10 +9,6 @@ upgrade = true; }; - # taps = [ - # "legcord/legcord" - # ]; - brews = [ "imagemagick" "opam" diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index d646f41..54945eb 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -1,5 +1,4 @@ { - lib, pkgs, config, ... diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index c65f724..395cf0f 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: { +{pkgs, ...}: { services = { avahi = { enable = true; diff --git a/modules/shared/extras.nix b/modules/shared/extras.nix index 272244b..b508ced 100644 --- a/modules/shared/extras.nix +++ b/modules/shared/extras.nix @@ -1,7 +1,5 @@ { pkgs, - config, - inputs, userSettings, ... }: { @@ -26,4 +24,33 @@ TERMINAL = userSettings.term; BROWSER = userSettings.browser; }; + + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml"; + + # pkgs.fetchurl { + # url = "https://raw.githubusercontent.com/tinted-theming/schemes/refs/heads/spec-0.11/base16/catppuccin-mocha.yaml"; + # hash = "sha256-+/adkhwuW/3jCJ3/EWxyz99u13yuTk9Fqqy0YZ4KPPY="; + # }; + + fonts = { + serif = { + package = pkgs.nerd-fonts.${userSettings.font}; + name = "Iosevka Nerd Font"; + }; + sansSerif = { + package = pkgs.nerd-fonts.${userSettings.font}; + name = "Iosevka Nerd Font"; + }; + monospace = { + package = pkgs.nerd-fonts.${userSettings.font}; + name = "Iosevka Nerd Font"; + }; + emoji = { + package = pkgs.twemoji-color-font; + name = "Twemoji Color"; + }; + }; + }; } diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index c721fe2..d9f8ec0 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -1,8 +1,4 @@ -{ - config, - inputs, - ... -}: { +{inputs, ...}: { nixpkgs.config = { allowUnfree = true; };