diff --git a/flake.lock b/flake.lock index e21757a..b5cbf19 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,120 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1703982197, + "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-alacritty-yaml": { + "flake": false, + "locked": { + "lastModified": 1674275109, + "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { @@ -16,6 +131,38 @@ "type": "github" } }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", + "repo": "base16-vim", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -37,34 +184,14 @@ "type": "github" } }, - "eww-wayland": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1710935108, - "narHash": "sha256-O4zGpwaXhnD+01zTn6cQZDgU3HagGt4DBPpQyDbD6fk=", - "owner": "elkowar", - "repo": "eww", - "rev": "f1ec00a1c9a24c0738fb5d5ac309d6af16e67415", - "type": "github" - }, - "original": { - "owner": "elkowar", - "repo": "eww", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -74,32 +201,32 @@ } }, "flake-compat_2": { - "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "nix-community", "repo": "flake-compat", "type": "github" } }, "flake-compat_3": { + "flake": false, "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", - "owner": "nix-community", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -107,11 +234,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -147,11 +274,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -162,14 +289,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_4" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -183,11 +310,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -219,11 +346,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -232,21 +359,19 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_8" - }, + "fromYaml": { + "flake": false, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "SenchoPens", + "repo": "fromYaml", "type": "github" } }, @@ -271,12 +396,29 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1698794309, + "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "45.1", + "repo": "gnome-shell", + "type": "github" + } + }, "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1710936585, @@ -312,6 +454,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706001011, + "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": "hyprlang", @@ -343,8 +506,8 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_4", + "nixpkgs": "nixpkgs_2", + "systems": "systems_3", "wlroots": "wlroots", "xdph": "xdph" }, @@ -394,7 +557,7 @@ "hyprcursor", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1709914708, @@ -437,7 +600,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { @@ -477,7 +640,7 @@ "inputs": { "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -518,9 +681,9 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1710897544, @@ -538,16 +701,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708407374, - "narHash": "sha256-EECzarm+uqnNDCwaGg/ppXCO11qibZ1iigORShkkDf0=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f33dd27a47ebdf11dc8a5eb05e7c8fbdaf89e73f", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -600,10 +763,10 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1710857677, @@ -620,22 +783,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -651,7 +798,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1684570954, "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", @@ -667,7 +814,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1710806803, "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", @@ -683,7 +830,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1703134684, "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", @@ -699,7 +846,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1710631334, "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", @@ -715,7 +862,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1710765496, "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", @@ -731,7 +878,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -747,12 +894,28 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -771,41 +934,19 @@ }, "root": { "inputs": { - "eww-wayland": "eww-wayland", "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", "nix-colors": "nix-colors", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2", + "stylix": "stylix" } }, "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "eww-wayland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708395022, - "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "helix", @@ -830,10 +971,10 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1710900660, @@ -849,22 +990,37 @@ "type": "github" } }, - "systems": { + "stylix": { + "inputs": { + "base16": "base16", + "base16-alacritty": "base16-alacritty", + "base16-alacritty-yaml": "base16-alacritty-yaml", + "base16-fish": "base16-fish", + "base16-foot": "base16-foot", + "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_4", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_9" + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1711224130, + "narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=", + "owner": "danth", + "repo": "stylix", + "rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "danth", + "repo": "stylix", "type": "github" } }, - "systems_2": { + "systems": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -879,7 +1035,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -894,7 +1050,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -909,7 +1065,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -924,7 +1080,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -939,7 +1095,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -954,7 +1110,7 @@ "type": "github" } }, - "systems_8": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index de0e3ea..6f20131 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,6 @@ nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable"; rust-overlay.url = "github:oxalica/rust-overlay"; - eww-wayland.url = "github:elkowar/eww"; - # tmp fix https://github.com/elkowar/eww/issues/817 - # eww-wayland.inputs.nixpkgs.follows = "nixpkgs-wayland"; - # eww-wayland.inputs.rust-overlay.follows = "rust-overlay"; # Home manager home-manager.url = "github:nix-community/home-manager"; @@ -22,9 +18,12 @@ # TODO: Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; - # nixify themex and make everything match nicely with nix-colors! + # TODO: remove and switch to stylix completely nix-colors.url = "github:misterio77/nix-colors"; + # stylix + stylix.url = "github:danth/stylix"; + pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; }; @@ -34,6 +33,7 @@ pre-commit-hooks, home-manager, hyprland, + stylix, ... } @ inputs: { checks.x86_64-linux = { @@ -61,7 +61,7 @@ modules = [ ./hosts/framnix/configuration.nix hyprland.nixosModules.default - # { programs.hyprland.enable = true; } + stylix.nixosModules.stylix ]; }; @@ -71,7 +71,7 @@ modules = [ ./hosts/DanPC/configuration.nix hyprland.nixosModules.default - # { programs.hyprland.enable = true; } + stylix.nixosModules.stylix ]; }; }; @@ -87,6 +87,8 @@ ./lib/default.nix ./home/default.nix ./hosts/framnix/default.nix + stylix.homeManagerModules.stylix + ./hosts/framnix/stylix.nix hyprland.homeManagerModules.default { wayland.windowManager.hyprland.enable = true; @@ -106,6 +108,8 @@ ./lib/default.nix ./home/default.nix ./hosts/DanPC/default.nix + stylix.homeManagerModules.stylix + ./hosts/DanPC/stylix.nix hyprland.homeManagerModules.default { wayland.windowManager.hyprland.enable = true; diff --git a/home/.config/eww/eww.scss b/home/.config/eww/eww.scss index b6d99a1..e8bdd80 100644 --- a/home/.config/eww/eww.scss +++ b/home/.config/eww/eww.scss @@ -21,7 +21,7 @@ $orange: #fab387; color: $text-color; border-radius: 1.2rem; border: 0.05rem solid $accent-color; - font-size: 1.5rem; + font-size: 1.0rem; } .bar { diff --git a/home/default.nix b/home/default.nix index 0372eeb..59cab7d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,6 +5,7 @@ lib, config, pkgs, + stylix, ... }: { # You can import other home-manager modules here @@ -42,32 +43,48 @@ }; }; - # TODO: Set your username home = { username = "dan"; homeDirectory = "/home/dan"; }; + stylix.image = ./.config/wallpapers/catppuccin-forrest.png; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + stylix.fonts = { + monospace = { + package = pkgs.nerdfonts.override {fonts = ["FiraCode"];}; + name = "FiraCode Nerd Font Mono"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + stylix.opacity.terminal = 0.9; + + # managing these manually + stylix.targets.vscode.enable = false; + colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; programs.dircolors.enable = true; programs.bat = { enable = true; config = { pager = "less -FR"; - theme = "CatppuccinMocha"; + # theme = "CatppuccinMocha"; }; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; - themes = { - CatppuccinMocha = { - src = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; # Bat uses sublime syntax for its themes - rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; - sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9"; - }; - file = "Catppuccin-mocha.tmTheme"; - }; - }; + # themes = { + # CatppuccinMocha = { + # src = pkgs.fetchFromGitHub { + # owner = "catppuccin"; + # repo = "bat"; # Bat uses sublime syntax for its themes + # rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; + # sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9"; + # }; + # file = "Catppuccin-mocha.tmTheme"; + # }; + # }; }; fonts.fontconfig.enable = true; @@ -94,10 +111,9 @@ # wayland/DE libnotify # notify-send command - mako + # mako swaylock wofi - waybar hyprpaper hyprpicker grim @@ -109,6 +125,7 @@ alacritty kitty ranger + dconf # needed for smth with gtk # audio pipewire @@ -123,7 +140,6 @@ wget zsh starship - zellij eza pfetch neofetch @@ -141,8 +157,6 @@ } ) recursive # for eww - fira-code - fira-code-symbols noto-fonts noto-fonts-cjk noto-fonts-emoji @@ -220,19 +234,13 @@ recursive = true; source = ./.config/wallpapers; }; - - # Cursor - home.pointerCursor = { - name = "Catppuccin-Mocha-Dark-Cursors"; - package = pkgs.catppuccin-cursors.mochaDark; - size = 16; - }; - # mako (notifications) config - xdg.configFile."mako" = { - recursive = true; - source = ./.config/mako; - }; + # xdg.configFile."mako" = { + # recursive = true; + # source = ./.config/mako; + # }; + + services.mako.enable = true; # wofi (app launcher) xdg.configFile."wofi" = { @@ -240,11 +248,14 @@ source = ./.config/wofi; }; + programs.swaylock.enable = true; + programs.zellij.enable = true; + # swaylock - xdg.configFile."swaylock" = { - recursive = true; - source = ./.config/swaylock; - }; + # xdg.configFile."swaylock" = { + # recursive = true; + # source = ./.config/swaylock; + # }; xdg.configFile."helix" = { recursive = true; source = ./.config/helix; diff --git a/home/eww.nix b/home/eww.nix index ebea76f..4a47dda 100644 --- a/home/eww.nix +++ b/home/eww.nix @@ -7,7 +7,6 @@ ]; programs.eww = { enable = true; - package = pkgs.eww-wayland; configDir = ./.config/eww; }; # Needed for music widget diff --git a/home/terminals/kitty.nix b/home/terminals/kitty.nix index 1fdddcb..3eb558a 100644 --- a/home/terminals/kitty.nix +++ b/home/terminals/kitty.nix @@ -8,10 +8,6 @@ in { programs.kitty = { enable = true; - font = { - name = default.terminal.font; - }; - theme = "Catppuccin-Mocha"; settings = { scrollback_lines = 10000; placement_strategy = "center"; @@ -27,8 +23,6 @@ in { selection_foreground = "none"; selection_background = "none"; - - background_opacity = toString default.terminal.opacity; }; }; } diff --git a/hosts/DanPC/configuration.nix b/hosts/DanPC/configuration.nix index 3823788..3e330ee 100644 --- a/hosts/DanPC/configuration.nix +++ b/hosts/DanPC/configuration.nix @@ -5,14 +5,17 @@ config, lib, pkgs, + stylix, ... -}: { +}: let + settings = import ./settings.nix; +in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./stylix.nix ../configuration.nix ]; - networking.hostName = "DanPC"; hardware.opengl = { @@ -32,6 +35,8 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; + environment.variables."GDK_SCALE" = "2"; + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, # and migrated your data accordingly. # diff --git a/hosts/DanPC/default.nix b/hosts/DanPC/default.nix index 71ccd6b..704912a 100644 --- a/hosts/DanPC/default.nix +++ b/hosts/DanPC/default.nix @@ -5,8 +5,6 @@ }: let settings = import ./settings.nix; in { - programs.kitty.font.size = settings.font.size; - xdg.configFile.".hostSettings/settings.scss" = { text = '' @mixing rootContainer { diff --git a/hosts/DanPC/stylix.nix b/hosts/DanPC/stylix.nix new file mode 100644 index 0000000..70e936f --- /dev/null +++ b/hosts/DanPC/stylix.nix @@ -0,0 +1,23 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). +{ + config, + lib, + pkgs, + stylix, + ... +}: { + stylix.cursor = { + name = "Catppuccin-Mocha-Dark-Cursors"; + size = 64; + package = pkgs.catppuccin-cursors.mochaDark; + }; + + stylix.fonts.sizes = { + applications = 20; + desktop = 20; + popups = 20; + terminal = 20; + }; +} diff --git a/hosts/configuration.nix b/hosts/configuration.nix index b9ccb51..4ad2b9e 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -5,8 +5,21 @@ config, pkgs, lib, + stylix, ... }: { + # styling + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + stylix.fonts = { + monospace = { + package = pkgs.nerdfonts.override {fonts = ["FiraCode"];}; + name = "FiraCode Nerd Font Mono"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; nix.settings = { netrc-file = /etc/nix/.netrc; # for credentials (like pribate PyPI server) substituters = [ diff --git a/hosts/framnix/configuration.nix b/hosts/framnix/configuration.nix index bf69a72..1c37c57 100644 --- a/hosts/framnix/configuration.nix +++ b/hosts/framnix/configuration.nix @@ -7,6 +7,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./stylix.nix ../configuration.nix ]; diff --git a/hosts/framnix/default.nix b/hosts/framnix/default.nix index 41f8dac..5268c3c 100644 --- a/hosts/framnix/default.nix +++ b/hosts/framnix/default.nix @@ -5,5 +5,4 @@ }: let settings = import ./settings.nix; in { - programs.kitty.font.size = settings.font.size; } diff --git a/hosts/framnix/settings.nix b/hosts/framnix/settings.nix index 6a835ff..6d73094 100644 --- a/hosts/framnix/settings.nix +++ b/hosts/framnix/settings.nix @@ -1,4 +1,11 @@ { # settings specific to this host font.size = 10; + + stylix.font.sizes = { + applications = 12; + desktop = 12; + popups = 12; + terminal = 12; + }; } diff --git a/hosts/framnix/stylix.nix b/hosts/framnix/stylix.nix new file mode 100644 index 0000000..5a1fd53 --- /dev/null +++ b/hosts/framnix/stylix.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + pkgs, + stylix, + ... +}: { + stylix.cursor = { + name = "Catppuccin-Mocha-Dark-Cursors"; + size = 16; + package = pkgs.catppuccin-cursors.mochaDark; + }; + + stylix.fonts.sizes = { + applications = 12; + desktop = 12; + popups = 12; + terminal = 12; + }; +}