diff --git a/flake.lock b/flake.lock index 1b6bf4a..861357a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,119 @@ { "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-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": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", + "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-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": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -35,6 +149,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -74,6 +204,43 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -126,6 +293,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -167,6 +351,27 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -276,7 +481,8 @@ "nixpkgs": "nixpkgs", "nixvim": "nixvim", "shells": "shells", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "stylix": "stylix" } }, "shells": { @@ -317,6 +523,38 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "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_2", + "flake-utils": "flake-utils_2", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_3", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1724444244, + "narHash": "sha256-fH1lyJvJjUhZ8xMlmiI18EZNzodDSe74rFuwlZDL0aQ=", + "owner": "danth", + "repo": "stylix", + "rev": "d042af478ce87e188139480922a3085218194106", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -332,6 +570,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6ddf1e8..64eb086 100644 --- a/flake.nix +++ b/flake.nix @@ -18,9 +18,13 @@ url = "path:./shells"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { nixpkgs, home-manager, nixvim, sops-nix, shells, ... }@inputs: + outputs = { nixpkgs, home-manager, nixvim, sops-nix, stylix, ... }@inputs: let username = "nezia"; system = "x86_64-linux"; @@ -28,6 +32,7 @@ commonModules = hostname: [ ./hosts/${hostname} sops-nix.nixosModules.sops + stylix.nixosModules.stylix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home/base/default.nix b/home/base/default.nix index 3cc534b..2553c7a 100644 --- a/home/base/default.nix +++ b/home/base/default.nix @@ -3,7 +3,6 @@ { imports = [ ./core.nix - ./fonts.nix ./automount.nix ./mime.nix ./gnome diff --git a/home/base/fonts.nix b/home/base/fonts.nix deleted file mode 100644 index f56cb73..0000000 --- a/home/base/fonts.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: - -{ - fonts = { - fontconfig = { - enable = true; - defaultFonts = { - monospace = [ "MonaspiceNe Nerd Font" ]; - emoji = [ "Noto Color Emoji "]; - }; - }; - }; - - home.packages = with pkgs; [ - noto-fonts-color-emoji - (nerdfonts.override { fonts = [ "Monaspace" ]; }) - ]; -} diff --git a/home/base/gnome/default.nix b/home/base/gnome/default.nix index fc8d408..9e78cf2 100644 --- a/home/base/gnome/default.nix +++ b/home/base/gnome/default.nix @@ -9,9 +9,6 @@ pkgs.gnomeExtensions.appindicator.extensionUuid ]; }; - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - }; "org/gnome/desktop/input-sources" = { xkb-options = [ "compose:ralt" ]; }; @@ -25,23 +22,8 @@ enable = true; showMenubar = false; profile."7dfaed12-b68d-4459-8cb9-ecd3d49f3634" = { - visibleName = "Catppuccin Frappe"; default = true; - font = "MonaspiceNe Nerd Font 14"; customCommand = "tmux new-session -A -s main"; - colors = { - palette = [ "#51576d" "#e78284" "#a6d189" "#e5c890" "#8caaee" "#f4b8e4" "#81c8be" "#b5bfe2" "#626880" "#e78284" "#a6d189" "#e5c890" "#8caaee" "#f4b8e4" "#81c8be" "#a5adce" ]; - backgroundColor = "#303446"; - foregroundColor = "#c6d0f5"; - cursor = { - background = "#f2d5cf"; - foreground = "#303446"; - }; - highlight = { - background = "#f2d5cf"; - foreground = "#626880"; - }; - }; }; }; } diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix index 0d40dc2..168d66a 100644 --- a/hosts/vamos/default.nix +++ b/hosts/vamos/default.nix @@ -7,6 +7,7 @@ ../../modules/system.nix ../../modules/gnome.nix ../../modules/syncthing + ../../modules/stylix.nix ]; services.fprintd.enable = true; diff --git a/lucy.jpg b/lucy.jpg new file mode 100644 index 0000000..d011d74 Binary files /dev/null and b/lucy.jpg differ diff --git a/modules/stylix.nix b/modules/stylix.nix new file mode 100644 index 0000000..3aa0854 --- /dev/null +++ b/modules/stylix.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + stylix.enable = true; + stylix.image = ../lucy.jpg; + stylix.polarity = "dark"; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml"; + + stylix.fonts = { + monospace = { + package = pkgs.nerdfonts.override { fonts = [ "Monaspace" ]; }; + name = "MonaspiceNe Nerd Font"; + }; + }; +}