Add nix colors and try specialazation

This commit is contained in:
2023-02-28 17:27:55 +09:00
parent 066150fef2
commit 059ff0118d
11 changed files with 181 additions and 24 deletions
Generated
+51
View File
@@ -1,5 +1,21 @@
{
"nodes": {
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1665690101,
"narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-schemes",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@@ -156,6 +172,25 @@
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1672236234,
"narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=",
"owner": "misterio77",
"repo": "nix-colors",
"rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1",
"type": "github"
},
"original": {
"owner": "misterio77",
"repo": "nix-colors",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1677142198,
@@ -172,6 +207,21 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1655599917,
"narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1677063315,
@@ -209,6 +259,7 @@
"hyprland": "hyprland",
"jq": "jq",
"neovim-nightly": "neovim-nightly",
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_2",
"nur": "nur"
}
+1
View File
@@ -13,6 +13,7 @@
};
neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
nur.url = "github:nix-community/NUR";
nix-colors.url = "github:misterio77/nix-colors";
jq = {
url = "github:reegnz/jq-zsh-plugin";
flake = false;
+18
View File
@@ -16,6 +16,7 @@ with lib; let
swaylock --image $(find ${config.home.homeDirectory}/wallpapers/ -type f | shuf -n 1)
'';
in {
imports = [ ./gtk.nix ];
options.modules.apps = {enable = mkEnableOption "apps";};
config = mkIf cfg.enable {
@@ -28,11 +29,28 @@ in {
discord
swaylock
swayidle
zathura
]
++ [lock];
programs.kitty = {
enable = true;
settings = with config.colorScheme.colors; {
foreground = "#${base05}";
background = "#${base00}";
selection_background = "#${base05}";
selection_foreground = "#${base00}";
url_color = "#${base04}";
cursor = "#${base05}";
active_border_color = "#${base03}";
inactive_border_color = "#${base01}";
active_tab_background = "#${base00}";
active_tab_foreground = "#${base05}";
inactive_tab_background = "#${base01}";
inactive_tab_foreground = "#${base04}";
tab_bar_background = "#${base01}";
};
extraConfig = ''
enable_audio_bell no
confirm_os_window_close 0
+25
View File
@@ -0,0 +1,25 @@
{ config, pkgs, nix-colors, ... }:
let
inherit (nix-colors.lib-contrib { inherit pkgs; }) gtkThemeFromScheme;
in
rec {
gtk = {
enable = true;
theme = {
name = "${config.colorscheme.slug}";
package = gtkThemeFromScheme { scheme = config.colorscheme; };
};
};
services.xsettingsd = {
enable = true;
settings = {
"Net/ThemeName" = "${gtk.theme.name}";
};
};
qt = {
enable = true;
platformTheme = "gtk";
};
}
+34
View File
@@ -0,0 +1,34 @@
{ nix-colors, lib, ... }: rec {
imports = [ nix-colors.homeManagerModule ];
colorScheme = {
slug = "catppuccin-mocha";
name = "Catppuccin Mocha";
author = "https://github.com/catppuccin/catppuccin";
colors = {
base00 = "1e1e2e"; # base
base01 = "181825"; # mantle
base02 = "313244"; # surface0
base03 = "45475a"; # surface1
base04 = "585b70"; # surface2
base05 = "cdd6f4"; # text
base06 = "f5e0dc"; # rosewater
base07 = "b4befe"; # lavender
base08 = "f38ba8"; # red
base09 = "fab387"; # peach
base0A = "f9e2af"; # yellow
base0B = "a6e3a1"; # green
base0C = "94e2d5"; # teal
base0D = "89b4fa"; # blue
base0E = "cba6f7"; # mauve
base0F = "f2cdcd"; # flamingo
};
};
specialization.test.configuration = {
home.file.testfile.text = "very special";
};
}
+1
View File
@@ -9,6 +9,7 @@
./nvim
./direnv
./fcitx5
./colors
];
home.stateVersion = "22.11";
-16
View File
@@ -1,16 +0,0 @@
$base00: #1e1e2e; // base
$base01: #181825; // mantle
$base02: #313244; // surface0
$base03: #45475a; // surface1
$base04: #585b70; // surface2
$base05: #cdd6f4; // text
$base06: #f5e0dc; // rosewater
$base07: #b4befe; // lavender
$base08: #f38ba8; // red
$base09: #fab387; // peach
$base0A: #f9e2af; // yellow
$base0B: #a6e3a1; // green
$base0C: #94e2d5; // teal
$base0D: #89b4fa; // blue
$base0E: #cba6f7; // mauve
$base0F: #f2cdcd; // flamingo
+22 -5
View File
@@ -18,7 +18,6 @@ in {
bluez
gnunet
jaq
light
networkmanagerapplet
pavucontrol
playerctl
@@ -34,12 +33,30 @@ in {
jq
tiramisu
fusuma
eww-wayland
];
programs.eww = {
enable = true;
package = pkgs.eww-wayland;
configDir = ./.;
xdg.configFile."eww" = {
source = ./.;
recursive = true;
};
xdg.configFile."eww/_colors.scss".text = with config.colorScheme.colors; ''
$base00: #${base00};
$base01: #${base01};
$base02: #${base02};
$base03: #${base03};
$base04: #${base04};
$base05: #${base05};
$base06: #${base06};
$base07: #${base07};
$base08: #${base08};
$base09: #${base09};
$base0A: #${base0A};
$base0B: #${base0B};
$base0C: #${base0C};
$base0D: #${base0D};
$base0E: #${base0E};
$base0F: #${base0F};
'';
xdg.configFile."fusuma/config.yaml".source = ./fusuma.yaml;
};
+1 -1
View File
@@ -148,7 +148,7 @@ return {
settings = {
["nil"] = {
formatting = {
command = { "nixpkgs-fmt" },
command = { "nix-shell", "-p", "nixpkgs-fmt", "nixpkgs-fmt" },
},
},
},
+23 -1
View File
@@ -9,9 +9,31 @@ in {
options.modules.rofi = {enable = lib.mkEnableOption "rofi";};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [rofi-wayland];
home.file.".config/rofi" = {
xdg.configFile."rofi" = {
source = ./.;
recursive = true;
};
xdg.configFile."rofi/base16.rasi".text = with config.colorScheme.colors; ''
* {
base00: #${base00}
base01: #${base01};
base02: #${base02};
base03: #${base03};
base04: #${base04};
base05: #${base05};
base06: #${base06};
base07: #${base07};
base08: #${base08};
base09: #${base09};
base0A: #${base0A};
base0B: #${base0B};
base0C: #${base0C};
base0D: #${base0D};
base0E: #${base0E};
base0F: #${base0F};
}
/* vim:ft=css
'';
};
}
+5 -1
View File
@@ -15,7 +15,6 @@ in {
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
exa
bat
viu
htop
tldr
@@ -28,6 +27,11 @@ in {
nix-your-shell
];
programs.bat = {
enable = true;
config.theme = "base16";
};
programs.zsh = {
enable = true;
autocd = true;