From d95ea4ec2786555af1e01022809f354f5ae193bc Mon Sep 17 00:00:00 2001 From: doloro Date: Tue, 23 Sep 2025 10:35:48 +0000 Subject: [PATCH] font & stylix --- nix/configuration.nix | 1 + nix/flake.lock | 540 ++++++++++++++++++++++++++-- nix/flake.nix | 8 +- nix/home.nix | 1 + nix/modules/chromium/home.nix | 3 +- nix/modules/hyprland/home.nix | 16 +- nix/modules/hyprland/screenshot.nix | 8 + nix/modules/stylix/fonts.nix | 13 + nix/modules/stylix/home.nix | 22 ++ nix/modules/stylix/nixos.nix | 24 ++ nix/modules/stylix/shared.nix | 35 ++ nix/modules/stylix/theme.yml | 35 ++ 12 files changed, 680 insertions(+), 26 deletions(-) create mode 100644 nix/modules/hyprland/screenshot.nix create mode 100644 nix/modules/stylix/fonts.nix create mode 100644 nix/modules/stylix/home.nix create mode 100644 nix/modules/stylix/nixos.nix create mode 100644 nix/modules/stylix/shared.nix create mode 100644 nix/modules/stylix/theme.yml diff --git a/nix/configuration.nix b/nix/configuration.nix index 66c9b9d..78e6c1f 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ./modules/greetd/nixos.nix + ./modules/stylix/nixos.nix ./disks.nix ]; diff --git a/nix/flake.lock b/nix/flake.lock index ca54e36..2c6c99e 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -33,6 +33,73 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "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-helix": { + "flake": false, + "locked": { + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "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" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -54,6 +121,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -70,6 +153,119 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "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": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -92,6 +288,70 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "48.2", + "repo": "gnome-shell", + "type": "github" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": [ + "neovim-nightly-overlay", + "flake-parts" + ], + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -99,11 +359,11 @@ ] }, "locked": { - "lastModified": 1757698511, - "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", + "lastModified": 1758593331, + "narHash": "sha256-p+904PfmINyekyA/LieX3IYGsiFtExC00v5gSYfJtpM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3fcc92180c7462082cd849498369591dfb20855", + "rev": "9a2dc0efbc569ce9352a6ffb8e8ec8dbc098e142", "type": "github" }, "original": { @@ -157,11 +417,11 @@ ] }, "locked": { - "lastModified": 1757542864, - "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", + "lastModified": 1758192433, + "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", + "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", "type": "github" }, "original": { @@ -186,11 +446,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757811161, - "narHash": "sha256-laCB71qgn9Eht7bH1nobIzEiR5r7WRHAB7XHHxLTiLQ=", + "lastModified": 1758542519, + "narHash": "sha256-dAMZsDFYTSqPkBbQHvQoCCiyX7Z07nyPKThKq8yFq9c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "559024c3314e4b1180b10b80fce4e9f20bad14c8", + "rev": "70a7047ee175d2e7fca1575d50a3738ac40fd2c6", "type": "github" }, "original": { @@ -279,11 +539,11 @@ ] }, "locked": { - "lastModified": 1757508108, - "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", + "lastModified": 1757694755, + "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", + "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", "type": "github" }, "original": { @@ -371,13 +631,53 @@ "type": "github" } }, + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1758585901, + "narHash": "sha256-Sjx8CEAaGivPaEaOeEI3ADljszc3Rey3oE8NOpZP85Y=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "095a690e04f89107ba15c3b7ebd1954e0802adfe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1758583287, + "narHash": "sha256-Sg1Ge7rBC3jL9kg/xlkdr9rbvJILIUu6jkMnV28zMEE=", + "owner": "neovim", + "repo": "neovim", + "rev": "78371610769f980cd0a629853628de5fe9127cee", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -389,11 +689,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -403,6 +719,31 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "owner": "nix-community", + "repo": "NUR", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -413,11 +754,11 @@ ] }, "locked": { - "lastModified": 1757588530, - "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -451,9 +792,11 @@ "disko": "disko", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "neovim-nightly-overlay": "neovim-nightly-overlay", + "nixpkgs": "nixpkgs_3", "quickshell": "quickshell", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "stylix": "stylix" } }, "sops-nix": { @@ -476,6 +819,40 @@ "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-parts": "flake-parts_2", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1758612110, + "narHash": "sha256-iwADWo5aARai4TKBylPwBkg73gUTPjfrsLGr9Vrfa8g=", + "owner": "nix-community", + "repo": "stylix", + "rev": "ef025b8de39802b05ed3f42d2045fd7324174f42", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -491,6 +868,123 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758206697, + "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/nix/flake.nix b/nix/flake.nix index 2f7fe6d..37fed28 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -21,12 +21,18 @@ url = "github:nix-community/disko/latest"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:nix-community/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; }; outputs = inputs@{ nixpkgs, home-manager, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; config = { allowUnfree = true; }; }; + overlays = [inputs.neovim-nightly-overlay.overlays.default]; in { homeConfigurations."doloro" = home-manager.lib.homeManagerConfiguration { @@ -46,7 +52,7 @@ specialArgs = { inherit inputs system; }; - modules = [ ./configuration.nix inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko ]; + modules = [ ./configuration.nix inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko {nixpkgs.overlays = overlays;} inputs.stylix.nixosModules.stylix]; }; }; } diff --git a/nix/home.nix b/nix/home.nix index 011887b..52cabae 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -6,6 +6,7 @@ ./modules/quickshell/home.nix ./modules/chromium/home.nix ./modules/neovim/home.nix + ./modules/stylix/home.nix ]; # Home Manager needs a bit of information about you and the paths it should # manage. diff --git a/nix/modules/chromium/home.nix b/nix/modules/chromium/home.nix index 4d62d5e..89f70a8 100644 --- a/nix/modules/chromium/home.nix +++ b/nix/modules/chromium/home.nix @@ -7,7 +7,8 @@ in enable = true; extensions = [ { id = "ghmbeldphafepmbegfdlkpapadhbakde"; } # ProtonPass - { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # Ublock + #{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # Ublok + { id = "ddkjiahejlhfcafbddmgiahcphecmpfh"; } # Ublock lite { id = "kpmjjdhbcfebfjgdnpjagcndoelnidfj"; } # Control panel for twitter { id = "aighbdamfnndbemigjcbkdklkegkgmpl"; } # Better twitter embeds { id = "enamippconapkdmgfgjchkhakpfinmaj"; } # DeArrow diff --git a/nix/modules/hyprland/home.nix b/nix/modules/hyprland/home.nix index 77c3edd..0991b1b 100644 --- a/nix/modules/hyprland/home.nix +++ b/nix/modules/hyprland/home.nix @@ -15,5 +15,19 @@ in package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; - programs.foot.enable = true; + # todo, split this into its own module; + programs.foot = { + enable = true; + settings = { + main = { + term = "xterm-256color"; + + #font = "CaskaydiaCove Nerd Font Mono:size=11"; + }; + + mouse = { + hide-when-typing = "yes"; + }; + }; + }; } diff --git a/nix/modules/hyprland/screenshot.nix b/nix/modules/hyprland/screenshot.nix new file mode 100644 index 0000000..3614cdd --- /dev/null +++ b/nix/modules/hyprland/screenshot.nix @@ -0,0 +1,8 @@ +{ inputs, pkgs, ... }: +let + +in { + home.packages = with pkgs; [ + wofi + ]; +} diff --git a/nix/modules/stylix/fonts.nix b/nix/modules/stylix/fonts.nix new file mode 100644 index 0000000..f76451b --- /dev/null +++ b/nix/modules/stylix/fonts.nix @@ -0,0 +1,13 @@ +{ + pkgs, + config, + ... +}: +{ + stylix.fonts = { + monospace = { + name = "CaskaydiaCove Nerd Font Mono"; + package = pkgs.nerd-fonts.caskaydia-cove; + }; + }; +} diff --git a/nix/modules/stylix/home.nix b/nix/modules/stylix/home.nix new file mode 100644 index 0000000..5ac35dd --- /dev/null +++ b/nix/modules/stylix/home.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: +let + cfg = config.modules.stylix; +in +{ + + imports = [ + ./shared.nix + inputs.stylix.homeModules.stylix + ]; + config = { + stylix.enable = true; + stylix.targets.hyprland.enable = true; + }; + +} diff --git a/nix/modules/stylix/nixos.nix b/nix/modules/stylix/nixos.nix new file mode 100644 index 0000000..84b4fb7 --- /dev/null +++ b/nix/modules/stylix/nixos.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: +let + cfg = config.modules.stylix; +in +{ + + imports = [ + ./shared.nix + inputs.stylix.nixosModules.stylix + ]; + options = { + modules.stylix.enable = lib.mkEnableOption "Steam configuration module"; + }; + config = lib.mkIf cfg.enable { + stylix.enable = true; + }; + +} diff --git a/nix/modules/stylix/shared.nix b/nix/modules/stylix/shared.nix new file mode 100644 index 0000000..e3b964c --- /dev/null +++ b/nix/modules/stylix/shared.nix @@ -0,0 +1,35 @@ +{ + pkgs, + lib, + ... +}: +{ + imports = [ + ./fonts.nix + ]; + stylix = { + enable = true; + # image = ./wp.jpg; + # image = lib.mkDefault ./wp.jpg; + polarity = "dark"; + + # base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-mirage.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/horizon-dark.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/darkviolet.yaml"; + # base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/bright.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/eris.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/framer.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/uwunicorn.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/tarot.yaml"; + + # base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/framer.yaml"; + + # base16Scheme = lib.mkDefault "${pkgs.base24-schemes}/share/themes/tokyodark-terminal.yaml"; + + # base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/tokyodark-terminal.yaml"; + base16Scheme = ./theme.yml; + }; + # stylix.override = { + # base00 = "000000"; # make background completely black + # }; +} diff --git a/nix/modules/stylix/theme.yml b/nix/modules/stylix/theme.yml new file mode 100644 index 0000000..62085f7 --- /dev/null +++ b/nix/modules/stylix/theme.yml @@ -0,0 +1,35 @@ +scheme: "Generated Scheme" +author: "The Robots" +base00: "#000000" +base01: "#000000" +# base01: "#202020" +base02: "#303030" +base03: "#505050" +base04: "#b0b0b0" +base05: "#d0d0d0" +base06: "#e0e0e0" +base07: "#ffffff" +base08: "#f5708a" +base09: "#ee8122" +base0A: "#b8a300" +base0B: "#54bc5c" +base0C: "#00bab3" +base0D: "#00aff2" +base0E: "#9095ff" +base0F: "#d47ada" + +# base01: "#000000" +# base02: "#2e0a45" +# base03: "#571880" +# base04: "#7c2bb1" +# base05: "#9d41d8" +# base06: "#b95cf5" +# base07: "#d17bff" +# base08: "#e49dff" +# base09: "#ffa190" +# base0A: "#dcc264" +# base0B: "#9be16e" +# base0C: "#6feda7" +# base0D: "#72deee" +# base0E: "#a2bdff" +# base0F: "#e49dff"