repo: git submodules -> flake inputs
This commit is contained in:
parent
902c079413
commit
8d3acf6838
SSH key fingerprint:
SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
29 changed files with 95 additions and 800 deletions
29
.gitmodules
vendored
29
.gitmodules
vendored
|
|
@ -1,29 +0,0 @@
|
|||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/alacritty/catppuccin"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/alacritty/catppuccin
|
||||
url = https://github.com/catppuccin/catppuccin.git
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/clash/yacd"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/clash/yacd
|
||||
url = https://github.com/haishanh/yacd.git
|
||||
branch = gh-pages
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd
|
||||
url = https://github.com/MetaCubeX/metacubexd.git
|
||||
branch = gh-pages
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/fast-syntax-highlighting"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/zsh/fast-syntax-highlighting
|
||||
url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/fzf-tab"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/zsh/fzf-tab
|
||||
url = https://github.com/Aloxaf/fzf-tab.git
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/powerlevel10k"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/zsh/powerlevel10k
|
||||
url = https://github.com/romkatv/powerlevel10k.git
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-autosuggestions"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-autosuggestions
|
||||
url = https://github.com/zsh-users/zsh-autosuggestions.git
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-history-substring-search"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-history-substring-search
|
||||
url = https://github.com/zsh-users/zsh-history-substring-search.git
|
||||
[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-syntax-highlighting"]
|
||||
path = users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-syntax-highlighting
|
||||
url = https://github.com/zsh-users/zsh-syntax-highlighting.git
|
||||
37
flake.lock
37
flake.lock
|
|
@ -315,6 +315,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"metacubexd": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696853927,
|
||||
"narHash": "sha256-HzbU/TWXfRJytSwIpdJRMdeOUXE1pMxtKtmjhkWTXzk=",
|
||||
"owner": "MetaCubeX",
|
||||
"repo": "metacubexd",
|
||||
"rev": "0ff85616c7b9156e9d5eaee62eb811da5872a71d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "MetaCubeX",
|
||||
"ref": "gh-pages",
|
||||
"repo": "metacubexd",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -446,9 +463,11 @@
|
|||
"hyprland": "hyprland",
|
||||
"impermanence": "impermanence",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"metacubexd": "metacubexd",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"sops-nix": "sops-nix"
|
||||
"sops-nix": "sops-nix",
|
||||
"tokyonight": "tokyonight"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
|
|
@ -542,6 +561,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tokyonight": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1697104289,
|
||||
"narHash": "sha256-OJGgBcSTiIEnmGpYlNBmb3CzOmxb8W1Wjl7Fz0FhpbE=",
|
||||
"owner": "folke",
|
||||
"repo": "tokyonight.nvim",
|
||||
"rev": "dce0ab49ae751f4f3617ab42d6f20c72369c7cb1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "folke",
|
||||
"repo": "tokyonight.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wlroots": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
19
flake.nix
19
flake.nix
|
|
@ -1,6 +1,10 @@
|
|||
{
|
||||
inputs = {
|
||||
# Flake inputs
|
||||
## Nixpkgs
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
## Flakes
|
||||
berberman = {
|
||||
url = "github:berberman/flakes";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -44,6 +48,19 @@
|
|||
impermanence = {
|
||||
url = "github:nix-community/impermanence";
|
||||
};
|
||||
|
||||
## Non-Flake
|
||||
### Color scheme files
|
||||
tokyonight = {
|
||||
# TODO: base16.nix/Stylix when?
|
||||
url = "github:folke/tokyonight.nvim";
|
||||
flake = false;
|
||||
};
|
||||
### Clash WebUI
|
||||
metacubexd = {
|
||||
url = "github:MetaCubeX/metacubexd/gh-pages";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self,
|
||||
|
|
@ -57,6 +74,8 @@
|
|||
sops-nix,
|
||||
disko,
|
||||
impermanence,
|
||||
tokyonight,
|
||||
metacubexd,
|
||||
... } @ inputs: {
|
||||
|
||||
# nix-darwin (macOS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
{ pkgs, config, inputs, ... }:
|
||||
|
||||
{
|
||||
networking.proxy.default = "http://127.0.0.1:7890/";
|
||||
|
|
@ -27,5 +27,15 @@
|
|||
};
|
||||
};
|
||||
|
||||
environment.etc."clash-meta/metacubexd".source = ../../users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd;
|
||||
### Local Clash WebUI
|
||||
# You can also use the following website, just in case:
|
||||
# - metacubexd:
|
||||
# - GH Pages Custom Domain: http://d.metacubex.one
|
||||
# - GH Pages: https://metacubex.github.io/metacubexd
|
||||
# - Cloudflare Pages: https://metacubexd.pages.dev
|
||||
# - yacd (Yet Another Clash Dashboard):
|
||||
# - https://yacd.haishan.me
|
||||
# - clash-dashboard (buggy):
|
||||
# - https://clash.razord.top
|
||||
environment.etc."clash-meta/metacubexd".source = inputs.metacubexd;
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit aa608f17a525eccbf6f60ab29e46839b26c3eb0e
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# TokyoNight Alacritty Colors
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0xe1e2e7'
|
||||
foreground: '0x3760bf'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0xe9e9ed'
|
||||
red: '0xf52a65'
|
||||
green: '0x587539'
|
||||
yellow: '0x8c6c3e'
|
||||
blue: '0x2e7de9'
|
||||
magenta: '0x9854f1'
|
||||
cyan: '0x007197'
|
||||
white: '0x6172b0'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0xa1a6c5'
|
||||
red: '0xf52a65'
|
||||
green: '0x587539'
|
||||
yellow: '0x8c6c3e'
|
||||
blue: '0x2e7de9'
|
||||
magenta: '0x9854f1'
|
||||
cyan: '0x007197'
|
||||
white: '0x3760bf'
|
||||
|
||||
indexed_colors:
|
||||
- { index: 16, color: '0xb15c00' }
|
||||
- { index: 17, color: '0xc64343' }
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# TokyoNight Alacritty Colors
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0x222436'
|
||||
foreground: '0xc8d3f5'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0x1b1d2b'
|
||||
red: '0xff757f'
|
||||
green: '0xc3e88d'
|
||||
yellow: '0xffc777'
|
||||
blue: '0x82aaff'
|
||||
magenta: '0xc099ff'
|
||||
cyan: '0x86e1fc'
|
||||
white: '0x828bb8'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0x444a73'
|
||||
red: '0xff757f'
|
||||
green: '0xc3e88d'
|
||||
yellow: '0xffc777'
|
||||
blue: '0x82aaff'
|
||||
magenta: '0xc099ff'
|
||||
cyan: '0x86e1fc'
|
||||
white: '0xc8d3f5'
|
||||
|
||||
indexed_colors:
|
||||
- { index: 16, color: '0xff966c' }
|
||||
- { index: 17, color: '0xc53b53' }
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# TokyoNight Alacritty Colors
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0x1a1b26'
|
||||
foreground: '0xc0caf5'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0x15161e'
|
||||
red: '0xf7768e'
|
||||
green: '0x9ece6a'
|
||||
yellow: '0xe0af68'
|
||||
blue: '0x7aa2f7'
|
||||
magenta: '0xbb9af7'
|
||||
cyan: '0x7dcfff'
|
||||
white: '0xa9b1d6'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0x414868'
|
||||
red: '0xf7768e'
|
||||
green: '0x9ece6a'
|
||||
yellow: '0xe0af68'
|
||||
blue: '0x7aa2f7'
|
||||
magenta: '0xbb9af7'
|
||||
cyan: '0x7dcfff'
|
||||
white: '0xc0caf5'
|
||||
|
||||
indexed_colors:
|
||||
- { index: 16, color: '0xff9e64' }
|
||||
- { index: 17, color: '0xdb4b4b' }
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# TokyoNight Alacritty Colors
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0x24283b'
|
||||
foreground: '0xc0caf5'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0x1d202f'
|
||||
red: '0xf7768e'
|
||||
green: '0x9ece6a'
|
||||
yellow: '0xe0af68'
|
||||
blue: '0x7aa2f7'
|
||||
magenta: '0xbb9af7'
|
||||
cyan: '0x7dcfff'
|
||||
white: '0xa9b1d6'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0x414868'
|
||||
red: '0xf7768e'
|
||||
green: '0x9ece6a'
|
||||
yellow: '0xe0af68'
|
||||
blue: '0x7aa2f7'
|
||||
magenta: '0xbb9af7'
|
||||
cyan: '0x7dcfff'
|
||||
white: '0xc0caf5'
|
||||
|
||||
indexed_colors:
|
||||
- { index: 16, color: '0xff9e64' }
|
||||
- { index: 17, color: '0xdb4b4b' }
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit d1b0fb780966303aa4c7867c3da830291c62d902
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
# https://draculatheme.com/kitty
|
||||
#
|
||||
# Installation instructions:
|
||||
#
|
||||
# cp dracula.conf ~/.config/kitty/
|
||||
# echo "include dracula.conf" >> ~/.config/kitty/kitty.conf
|
||||
#
|
||||
# Then reload kitty for the config to take affect.
|
||||
# Alternatively copy paste below directly into kitty.conf
|
||||
|
||||
foreground #f8f8f2
|
||||
background #282a36
|
||||
selection_foreground #ffffff
|
||||
selection_background #44475a
|
||||
|
||||
url_color #8be9fd
|
||||
|
||||
# black
|
||||
color0 #21222c
|
||||
color8 #6272a4
|
||||
|
||||
# red
|
||||
color1 #ff5555
|
||||
color9 #ff6e6e
|
||||
|
||||
# green
|
||||
color2 #50fa7b
|
||||
color10 #69ff94
|
||||
|
||||
# yellow
|
||||
color3 #f1fa8c
|
||||
color11 #ffffa5
|
||||
|
||||
# blue
|
||||
color4 #bd93f9
|
||||
color12 #d6acff
|
||||
|
||||
# magenta
|
||||
color5 #ff79c6
|
||||
color13 #ff92df
|
||||
|
||||
# cyan
|
||||
color6 #8be9fd
|
||||
color14 #a4ffff
|
||||
|
||||
# white
|
||||
color7 #f8f8f2
|
||||
color15 #ffffff
|
||||
|
||||
# Cursor colors
|
||||
cursor #f8f8f2
|
||||
cursor_text_color background
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #282a36
|
||||
active_tab_background #f8f8f2
|
||||
inactive_tab_foreground #282a36
|
||||
inactive_tab_background #6272a4
|
||||
|
||||
# Marks
|
||||
mark1_foreground #282a36
|
||||
mark1_background #ff5555
|
||||
|
||||
# Splits/Windows
|
||||
active_border_color #f8f8f2
|
||||
inactive_border_color #6272a4
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Catppuccin Kitty Frappe
|
||||
## author: Catppuccin Org
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/frappe.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
|
||||
|
||||
# The basic colors
|
||||
foreground #C6D0F5
|
||||
background #303446
|
||||
selection_foreground #303446
|
||||
selection_background #F2D5CF
|
||||
|
||||
# Cursor colors
|
||||
cursor #F2D5CF
|
||||
cursor_text_color #303446
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #F2D5CF
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #BABBF1
|
||||
inactive_border_color #737994
|
||||
bell_border_color #E5C890
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #232634
|
||||
active_tab_background #CA9EE6
|
||||
inactive_tab_foreground #C6D0F5
|
||||
inactive_tab_background #292C3C
|
||||
tab_bar_background #232634
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #303446
|
||||
mark1_background #BABBF1
|
||||
mark2_foreground #303446
|
||||
mark2_background #CA9EE6
|
||||
mark3_foreground #303446
|
||||
mark3_background #85C1DC
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
color0 #51576D
|
||||
color8 #626880
|
||||
|
||||
# red
|
||||
color1 #E78284
|
||||
color9 #E78284
|
||||
|
||||
# green
|
||||
color2 #A6D189
|
||||
color10 #A6D189
|
||||
|
||||
# yellow
|
||||
color3 #E5C890
|
||||
color11 #E5C890
|
||||
|
||||
# blue
|
||||
color4 #8CAAEE
|
||||
color12 #8CAAEE
|
||||
|
||||
# magenta
|
||||
color5 #F4B8E4
|
||||
color13 #F4B8E4
|
||||
|
||||
# cyan
|
||||
color6 #81C8BE
|
||||
color14 #81C8BE
|
||||
|
||||
# white
|
||||
color7 #B5BFE2
|
||||
color15 #A5ADCE
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#
|
||||
# Kitty config
|
||||
# ~/.config/kitty/kitty.conf
|
||||
#
|
||||
|
||||
include tokyonight_night.conf
|
||||
#font_family JetBrainsMono Nerd Font
|
||||
font_family monospace
|
||||
font_size 12
|
||||
confirm_os_window_close 0
|
||||
window_padding_width 12
|
||||
adjust_line_height 0
|
||||
#background_opacity 0.9
|
||||
#shell fish
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Catppuccin Kitty Latte
|
||||
## author: Catppuccin Org
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
|
||||
|
||||
# The basic colors
|
||||
foreground #4C4F69
|
||||
background #EFF1F5
|
||||
selection_foreground #EFF1F5
|
||||
selection_background #DC8A78
|
||||
|
||||
# Cursor colors
|
||||
cursor #DC8A78
|
||||
cursor_text_color #EFF1F5
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #DC8A78
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #7287FD
|
||||
inactive_border_color #9CA0B0
|
||||
bell_border_color #DF8E1D
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #EFF1F5
|
||||
active_tab_background #8839EF
|
||||
inactive_tab_foreground #4C4F69
|
||||
inactive_tab_background #9CA0B0
|
||||
tab_bar_background #BCC0CC
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #EFF1F5
|
||||
mark1_background #7287fD
|
||||
mark2_foreground #EFF1F5
|
||||
mark2_background #8839EF
|
||||
mark3_foreground #EFF1F5
|
||||
mark3_background #209FB5
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
color0 #5C5F77
|
||||
color8 #6C6F85
|
||||
|
||||
# red
|
||||
color1 #D20F39
|
||||
color9 #D20F39
|
||||
|
||||
# green
|
||||
color2 #40A02B
|
||||
color10 #40A02B
|
||||
|
||||
# yellow
|
||||
color3 #DF8E1D
|
||||
color11 #DF8E1D
|
||||
|
||||
# blue
|
||||
color4 #1E66F5
|
||||
color12 #1E66F5
|
||||
|
||||
# magenta
|
||||
color5 #EA76CB
|
||||
color13 #EA76CB
|
||||
|
||||
# cyan
|
||||
color6 #179299
|
||||
color14 #179299
|
||||
|
||||
# white
|
||||
color7 #ACB0BE
|
||||
color15 #BCC0CC
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Catppuccin Kitty Macchiato
|
||||
## author: Catppuccin Org
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/macchiato.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
|
||||
|
||||
# The basic colors
|
||||
foreground #CAD3F5
|
||||
background #24273A
|
||||
selection_foreground #24273A
|
||||
selection_background #F4DBD6
|
||||
|
||||
# Cursor colors
|
||||
cursor #F4DBD6
|
||||
cursor_text_color #24273A
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #F4DBD6
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #B7BDF8
|
||||
inactive_border_color #6E738D
|
||||
bell_border_color #EED49F
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #181926
|
||||
active_tab_background #C6A0F6
|
||||
inactive_tab_foreground #CAD3F5
|
||||
inactive_tab_background #1E2030
|
||||
tab_bar_background #181926
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #24273A
|
||||
mark1_background #B7BDF8
|
||||
mark2_foreground #24273A
|
||||
mark2_background #C6A0F6
|
||||
mark3_foreground #24273A
|
||||
mark3_background #7DC4E4
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
color0 #494D64
|
||||
color8 #5B6078
|
||||
|
||||
# red
|
||||
color1 #ED8796
|
||||
color9 #ED8796
|
||||
|
||||
# green
|
||||
color2 #A6DA95
|
||||
color10 #A6DA95
|
||||
|
||||
# yellow
|
||||
color3 #EED49F
|
||||
color11 #EED49F
|
||||
|
||||
# blue
|
||||
color4 #8AADF4
|
||||
color12 #8AADF4
|
||||
|
||||
# magenta
|
||||
color5 #F5BDE6
|
||||
color13 #F5BDE6
|
||||
|
||||
# cyan
|
||||
color6 #8BD5CA
|
||||
color14 #8BD5CA
|
||||
|
||||
# white
|
||||
color7 #B8C0E0
|
||||
color15 #A5ADCB
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Catppuccin Kitty Mocha
|
||||
## author: Catppuccin Org
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
|
||||
|
||||
# The basic colors
|
||||
foreground #CDD6F4
|
||||
background #1E1E2E
|
||||
selection_foreground #1E1E2E
|
||||
selection_background #F5E0DC
|
||||
|
||||
# Cursor colors
|
||||
cursor #F5E0DC
|
||||
cursor_text_color #1E1E2E
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
url_color #F5E0DC
|
||||
|
||||
# Kitty window border colors
|
||||
active_border_color #B4BEFE
|
||||
inactive_border_color #6C7086
|
||||
bell_border_color #F9E2AF
|
||||
|
||||
# OS Window titlebar colors
|
||||
wayland_titlebar_color system
|
||||
macos_titlebar_color system
|
||||
|
||||
# Tab bar colors
|
||||
active_tab_foreground #11111B
|
||||
active_tab_background #CBA6F7
|
||||
inactive_tab_foreground #CDD6F4
|
||||
inactive_tab_background #181825
|
||||
tab_bar_background #11111B
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
mark1_foreground #1E1E2E
|
||||
mark1_background #B4BEFE
|
||||
mark2_foreground #1E1E2E
|
||||
mark2_background #CBA6F7
|
||||
mark3_foreground #1E1E2E
|
||||
mark3_background #74C7EC
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
color0 #45475A
|
||||
color8 #585B70
|
||||
|
||||
# red
|
||||
color1 #F38BA8
|
||||
color9 #F38BA8
|
||||
|
||||
# green
|
||||
color2 #A6E3A1
|
||||
color10 #A6E3A1
|
||||
|
||||
# yellow
|
||||
color3 #F9E2AF
|
||||
color11 #F9E2AF
|
||||
|
||||
# blue
|
||||
color4 #89B4FA
|
||||
color12 #89B4FA
|
||||
|
||||
# magenta
|
||||
color5 #F5C2E7
|
||||
color13 #F5C2E7
|
||||
|
||||
# cyan
|
||||
color6 #94E2D5
|
||||
color14 #94E2D5
|
||||
|
||||
# white
|
||||
color7 #BAC2DE
|
||||
color15 #A6ADC8
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Tokyo Night Day
|
||||
## license: MIT
|
||||
## author: Folke Lemaitre
|
||||
## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_day.conf
|
||||
|
||||
|
||||
background #e1e2e7
|
||||
foreground #3760bf
|
||||
selection_background #b6bfe2
|
||||
selection_foreground #3760bf
|
||||
url_color #387068
|
||||
cursor #3760bf
|
||||
cursor_text_color #e1e2e7
|
||||
|
||||
# Tabs
|
||||
active_tab_background #2e7de9
|
||||
active_tab_foreground #e9e9ec
|
||||
inactive_tab_background #c4c8da
|
||||
inactive_tab_foreground #8990b3
|
||||
#tab_bar_background #e9e9ed
|
||||
|
||||
# Windows
|
||||
active_border_color #2e7de9
|
||||
inactive_border_color #c4c8da
|
||||
|
||||
# normal
|
||||
color0 #e9e9ed
|
||||
color1 #f52a65
|
||||
color2 #587539
|
||||
color3 #8c6c3e
|
||||
color4 #2e7de9
|
||||
color5 #9854f1
|
||||
color6 #007197
|
||||
color7 #6172b0
|
||||
|
||||
# bright
|
||||
color8 #a1a6c5
|
||||
color9 #f52a65
|
||||
color10 #587539
|
||||
color11 #8c6c3e
|
||||
color12 #2e7de9
|
||||
color13 #9854f1
|
||||
color14 #007197
|
||||
color15 #3760bf
|
||||
|
||||
# extended colors
|
||||
color16 #b15c00
|
||||
color17 #c64343
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Tokyo Night Moon
|
||||
## license: MIT
|
||||
## author: Folke Lemaitre
|
||||
## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
|
||||
|
||||
|
||||
background #222436
|
||||
foreground #c8d3f5
|
||||
selection_background #2d3f76
|
||||
selection_foreground #c8d3f5
|
||||
url_color #4fd6be
|
||||
cursor #c8d3f5
|
||||
cursor_text_color #222436
|
||||
|
||||
# Tabs
|
||||
active_tab_background #82aaff
|
||||
active_tab_foreground #1e2030
|
||||
inactive_tab_background #2f334d
|
||||
inactive_tab_foreground #545c7e
|
||||
#tab_bar_background #1b1d2b
|
||||
|
||||
# Windows
|
||||
active_border_color #82aaff
|
||||
inactive_border_color #2f334d
|
||||
|
||||
# normal
|
||||
color0 #1b1d2b
|
||||
color1 #ff757f
|
||||
color2 #c3e88d
|
||||
color3 #ffc777
|
||||
color4 #82aaff
|
||||
color5 #c099ff
|
||||
color6 #86e1fc
|
||||
color7 #828bb8
|
||||
|
||||
# bright
|
||||
color8 #444a73
|
||||
color9 #ff757f
|
||||
color10 #c3e88d
|
||||
color11 #ffc777
|
||||
color12 #82aaff
|
||||
color13 #c099ff
|
||||
color14 #86e1fc
|
||||
color15 #c8d3f5
|
||||
|
||||
# extended colors
|
||||
color16 #ff966c
|
||||
color17 #c53b53
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Tokyo Night
|
||||
## license: MIT
|
||||
## author: Folke Lemaitre
|
||||
## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
|
||||
|
||||
|
||||
background #1a1b26
|
||||
foreground #c0caf5
|
||||
selection_background #283457
|
||||
selection_foreground #c0caf5
|
||||
url_color #73daca
|
||||
cursor #c0caf5
|
||||
cursor_text_color #1a1b26
|
||||
|
||||
# Tabs
|
||||
active_tab_background #7aa2f7
|
||||
active_tab_foreground #16161e
|
||||
inactive_tab_background #292e42
|
||||
inactive_tab_foreground #545c7e
|
||||
#tab_bar_background #15161e
|
||||
|
||||
# Windows
|
||||
active_border_color #7aa2f7
|
||||
inactive_border_color #292e42
|
||||
|
||||
# normal
|
||||
color0 #15161e
|
||||
color1 #f7768e
|
||||
color2 #9ece6a
|
||||
color3 #e0af68
|
||||
color4 #7aa2f7
|
||||
color5 #bb9af7
|
||||
color6 #7dcfff
|
||||
color7 #a9b1d6
|
||||
|
||||
# bright
|
||||
color8 #414868
|
||||
color9 #f7768e
|
||||
color10 #9ece6a
|
||||
color11 #e0af68
|
||||
color12 #7aa2f7
|
||||
color13 #bb9af7
|
||||
color14 #7dcfff
|
||||
color15 #c0caf5
|
||||
|
||||
# extended colors
|
||||
color16 #ff9e64
|
||||
color17 #db4b4b
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
# vim:ft=kitty
|
||||
|
||||
## name: Tokyo Night Storm
|
||||
## license: MIT
|
||||
## author: Folke Lemaitre
|
||||
## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
|
||||
|
||||
|
||||
background #24283b
|
||||
foreground #c0caf5
|
||||
selection_background #2e3c64
|
||||
selection_foreground #c0caf5
|
||||
url_color #73daca
|
||||
cursor #c0caf5
|
||||
cursor_text_color #24283b
|
||||
|
||||
# Tabs
|
||||
active_tab_background #7aa2f7
|
||||
active_tab_foreground #1f2335
|
||||
inactive_tab_background #292e42
|
||||
inactive_tab_foreground #545c7e
|
||||
#tab_bar_background #1d202f
|
||||
|
||||
# Windows
|
||||
active_border_color #7aa2f7
|
||||
inactive_border_color #292e42
|
||||
|
||||
# normal
|
||||
color0 #1d202f
|
||||
color1 #f7768e
|
||||
color2 #9ece6a
|
||||
color3 #e0af68
|
||||
color4 #7aa2f7
|
||||
color5 #bb9af7
|
||||
color6 #7dcfff
|
||||
color7 #a9b1d6
|
||||
|
||||
# bright
|
||||
color8 #414868
|
||||
color9 #f7768e
|
||||
color10 #9ece6a
|
||||
color11 #e0af68
|
||||
color12 #7aa2f7
|
||||
color13 #bb9af7
|
||||
color14 #7dcfff
|
||||
color15 #c0caf5
|
||||
|
||||
# extended colors
|
||||
color16 #ff9e64
|
||||
color17 #db4b4b
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit cf318e06a9b7c9f2219d78f41b46fa6e06011fd9
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 400e58a87f72ecec14f783fbd29bc6be4ff1641c
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{ pkgs, config, lib, inputs, ... }:
|
||||
|
||||
{
|
||||
home = {
|
||||
|
|
@ -55,15 +55,24 @@
|
|||
};
|
||||
zsh = {
|
||||
enable = true;
|
||||
### XDG
|
||||
dotDir = ".config/zsh";
|
||||
### Plugins
|
||||
syntaxHighlighting.enable = true;
|
||||
historySubstringSearch.enable = true;
|
||||
enableAutosuggestions = true;
|
||||
dotDir = ".config/zsh";
|
||||
initExtra = ''
|
||||
source ${config.xdg.configHome}/zsh/plugins/sudo/sudo.plugin.zsh
|
||||
source ${config.xdg.configHome}/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh
|
||||
zstyle ':fzf-tab:*' fzf-command sk
|
||||
'';
|
||||
plugins = [
|
||||
{
|
||||
name = "fzf-tab";
|
||||
src = pkgs.zsh-fzf-tab;
|
||||
}
|
||||
{
|
||||
name = "sudo";
|
||||
src = ./dotfiles/config/zsh/sudo;
|
||||
}
|
||||
];
|
||||
initExtra = "zstyle ':fzf-tab:*' fzf-command sk";
|
||||
### History
|
||||
history = {
|
||||
path = "${config.xdg.configHome}/zsh/.zsh_history";
|
||||
save = 1000000;
|
||||
|
|
@ -106,7 +115,7 @@
|
|||
alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
import = [ "${config.xdg.configHome}/alacritty/tokyonight/tokyonight_night.yml" ];
|
||||
import = [ "${inputs.tokyonight}/extras/alacritty/tokyonight_night.yml" ];
|
||||
cursor.style = "beam";
|
||||
env.WINIT_X11_SCALE_FACTOR = "1";
|
||||
window = {
|
||||
|
|
@ -138,6 +147,17 @@
|
|||
};
|
||||
};
|
||||
|
||||
kitty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
include = "${inputs.tokyonight}/extras/kitty/tokyonight_night.conf";
|
||||
font_size = 12;
|
||||
confirm_os_window_close = 0;
|
||||
window_padding_width = 6;
|
||||
adjust_line_height = 0;
|
||||
};
|
||||
};
|
||||
|
||||
# Editors
|
||||
### VSCode
|
||||
vscode = {
|
||||
|
|
|
|||
|
|
@ -7,21 +7,9 @@ let
|
|||
in
|
||||
{
|
||||
xdg.configFile = {
|
||||
"clash-meta" = {
|
||||
source = "${configPath}/clash";
|
||||
recursive = true;
|
||||
};
|
||||
"alacritty" = {
|
||||
source = "${configPath}/alacritty";
|
||||
recursive = true;
|
||||
};
|
||||
"fish" = {
|
||||
source = "${configPath}/fish";
|
||||
recursive = true;
|
||||
};
|
||||
"zsh/plugins" = {
|
||||
source = "${configPath}/zsh";
|
||||
recursive = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -8,18 +8,10 @@ let
|
|||
in
|
||||
{
|
||||
xdg.configFile = {
|
||||
"alacritty" = {
|
||||
source = "${configPath}/alacritty";
|
||||
recursive = true;
|
||||
};
|
||||
"foot" = {
|
||||
source = "${configPath}/foot";
|
||||
recursive = true;
|
||||
};
|
||||
"kitty" = {
|
||||
source = "${configPath}/kitty";
|
||||
recursive = true;
|
||||
};
|
||||
"fish" = {
|
||||
source = "${configPath}/fish";
|
||||
recursive = true;
|
||||
|
|
@ -40,10 +32,6 @@ in
|
|||
source = "${configPath}/rofi";
|
||||
recursive = true;
|
||||
};
|
||||
"zsh/plugins" = {
|
||||
source = "${configPath}/zsh";
|
||||
recursive = true;
|
||||
};
|
||||
"mpv" = {
|
||||
source = "${configPath}/mpv";
|
||||
recursive = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue