change theme from onedark to catppuccin

This commit is contained in:
Kim, Jimin 2025-05-05 14:11:13 +09:00
parent e3c01c713d
commit 430d8ff024
Signed by: pomp
GPG key ID: D3932F82A0667A3B
23 changed files with 193 additions and 134 deletions

View file

@ -2,14 +2,17 @@
"cSpell.words": [
"anthy",
"anytype",
"atuin",
"bufferline",
"cachix",
"catppuccin",
"chillhop",
"colorschemes",
"compatibilitytools",
"dconf",
"devenv",
"devicons",
"direnv",
"dotfiles",
"floaterm",
"fontconfig",
@ -20,13 +23,16 @@
"gitbutler",
"gvariant",
"Hanja",
"homelab",
"ibus",
"justfile",
"keymap",
"keymaps",
"killall",
"lazydocker",
"lazygit",
"lunarclient",
"macchiato",
"Meslo",
"monero",
"mullvad",
@ -37,7 +43,6 @@
"nixvim",
"nordified",
"Noto",
"onedark",
"Östberg",
"papirus",
"pipewire",
@ -46,11 +51,13 @@
"pompydev",
"protonup",
"pulseaudio",
"pyenv",
"Rustc",
"tailscale",
"uniemoji",
"vboxusers",
"Vimjoyer",
"virtualenv",
"virtualisation",
"wakatime"
],

37
flake.lock generated
View file

@ -22,6 +22,24 @@
"type": "github"
}
},
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1746175539,
"narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=",
"owner": "catppuccin",
"repo": "nix",
"rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@ -131,6 +149,22 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1745138883,
"narHash": "sha256-P7Ko8OBlvJDYkfSiZ5oGrez2JPoF+R6twx82rO6XIJ4=",
@ -194,8 +228,9 @@
"root": {
"inputs": {
"browser-previews": "browser-previews",
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim"
}
},

View file

@ -3,6 +3,7 @@
inputs = {
nixpkgs.url = "github:pompydev/nixpkgs/master";
catppuccin.url = "github:catppuccin/nix";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
@ -18,7 +19,7 @@
};
outputs =
{ nixvim, ... }@inputs:
{ nixvim, catppuccin, ... }@inputs:
let
nixpkgs = inputs.nixpkgs.legacyPackages."x86_64-linux".applyPatches {
@ -41,6 +42,12 @@
modules = [
./hosts/desktop/configuration.nix
nixvim.nixosModules.nixvim
catppuccin.nixosModules.catppuccin
{
home-manager.users.pomp = {
imports = [ catppuccin.homeModules.catppuccin ];
};
}
];
};
@ -53,6 +60,12 @@
modules = [
./hosts/laptop/configuration.nix
nixvim.nixosModules.nixvim
catppuccin.nixosModules.catppuccin
{
home-manager.users.pomp = {
imports = [ catppuccin.homeModules.catppuccin ];
};
}
];
};
@ -64,6 +77,12 @@
modules = [
./hosts/homelab2/configuration.nix
catppuccin.nixosModules.catppuccin
{
home-manager.users.homelab2 = {
imports = [ catppuccin.homeModules.catppuccin ];
};
}
];
};
};

View file

@ -1,51 +0,0 @@
# https://starship.rs/config
"$schema" = 'https://starship.rs/config-schema.json'
format = """$directory$character"""
right_format = """$all"""
[aws]
disabled = true
[bun]
format = '[$symbol($version )]($style)'
[cmake]
format = '[$symbol($version )]($style)'
[conda]
format = '[$symbol$environment]($style) '
[deno]
format = '[$symbol($version )]($style)'
[docker_context]
format = '[$symbol$context]($style) '
[dotnet]
format = '[$symbol($version )(🎯 $tfm )]($style)'
[git_branch]
format = '[$symbol$branch(:$remote_branch)]($style) '
symbol = " "
[golang]
format = '[$symbol($version )]($style)'
[nix_shell]
format = '[$symbol$state( \($name\))]($style) '
[nodejs]
format = '[$symbol($version )]($style)'
[package]
format = '[$symbol$version]($style) '
[python]
format = '[${symbol}${pyenv_prefix}(${version} )(\($virtualenv\) )]($style)'
[rust]
format = '[$symbol($version )]($style)'
[zig]
format = '[$symbol($version )]($style)'

View file

@ -5,7 +5,7 @@
"useQuickCss": true,
"themeLinks": [],
"enabledThemes": [
"nordic.theme.css"
"catppuccin-frappe.theme.css"
],
"enableReactDevtools": false,
"frameless": false,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,11 +0,0 @@
# https://github.com/atuinsh/atuin
eval "$(atuin init zsh)"
# https://github.com/junegunn/fzf
eval "$(fzf --zsh)"
# https://direnv.net
eval "$(direnv hook zsh)"
# https://nodejs.org/docs/latest/api/cli.html#node_compile_cachedir
NODE_COMPILE_CACHE=~/.node-compile-cache

View file

@ -63,11 +63,9 @@ args@{
## General CLI / TUI
oha
wget
btop
nvitop
tree
usbutils
lazygit
hotspot
desktop-file-utils
## Game dev

View file

@ -2,7 +2,10 @@
{
imports = [
../../modules/home-manager/bat.nix
../../modules/home-manager/brave.nix
../../modules/home-manager/btop.nix
../../modules/home-manager/catppuccin.nix
../../modules/home-manager/dconf-gnome-desktop.nix
../../modules/home-manager/dconf-gnome-extension-blur-my-shell.nix
../../modules/home-manager/dconf-gnome-extensions.nix
@ -13,6 +16,7 @@
../../modules/home-manager/ghostty.nix
../../modules/home-manager/osu.nix
../../modules/home-manager/otd.nix
../../modules/home-manager/shell.nix
../../modules/home-manager/vesktop.nix
../../modules/home-manager/vscode.nix
../../modules/home-manager/xdg-user-dirs.nix
@ -22,10 +26,6 @@
home.username = "pomp";
home.homeDirectory = "/home/pomp";
home.file = {
".zshrc".source = ../../home/.zshrc;
".config/starship.toml".source = ../../home/.config/starship.toml;
};
gtk.gtk3.bookmarks = [
"file://$HOME/Downloads"

View file

@ -8,11 +8,13 @@ args@{
imports = [
./hardware-configuration.nix
./modules/ssh.nix
../../modules/nixos/locale.nix
../../modules/nixos/devenv.nix
(import ../../modules/nixos/docker.nix (args // { user = "homelab2"; }))
../../modules/nixos/fonts.nix
../../modules/nixos/gnome-remote-desktop.nix
../../modules/nixos/locale.nix
(import ../../modules/nixos/nix.nix (args // { user = "homelab2"; }))
../../modules/nixos/nixvim.nix
(import ../../modules/nixos/shell.nix (args // { user = "homelab2"; }))
inputs.home-manager.nixosModules.home-manager
];
@ -27,9 +29,6 @@ args@{
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
# dev
vim
direnv
devenv
vscode
# GUI

View file

@ -2,7 +2,10 @@
{
imports = [
../../modules/home-manager/bat.nix
../../modules/home-manager/brave.nix
../../modules/home-manager/btop.nix
../../modules/home-manager/catppuccin.nix
../../modules/home-manager/dconf-gnome-desktop.nix
../../modules/home-manager/dconf-gnome-extension-blur-my-shell.nix
../../modules/home-manager/dconf-gnome-extensions.nix
@ -10,6 +13,7 @@
../../modules/home-manager/dconf-nautilus.nix
../../modules/home-manager/git.nix
../../modules/home-manager/nautilus.nix
../../modules/home-manager/shell.nix
../../modules/home-manager/ghostty.nix
../../modules/home-manager/xdg-user-dirs.nix
];
@ -18,10 +22,6 @@
home.username = "homelab2";
home.homeDirectory = "/home/homelab2";
home.file = {
".zshrc".source = ../../home/.zshrc;
".config/starship.toml".source = ../../home/.config/starship.toml;
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

View file

@ -2,7 +2,10 @@
{
imports = [
../../modules/home-manager/bat.nix
../../modules/home-manager/brave.nix
../../modules/home-manager/btop.nix
../../modules/home-manager/catppuccin.nix
../../modules/home-manager/dconf-gnome-desktop.nix
../../modules/home-manager/dconf-gnome-extension-blur-my-shell.nix
../../modules/home-manager/dconf-gnome-extensions.nix
@ -12,6 +15,7 @@
../../modules/home-manager/nautilus.nix
../../modules/home-manager/ghostty.nix
../../modules/home-manager/osu.nix
../../modules/home-manager/shell.nix
../../modules/home-manager/vesktop.nix
../../modules/home-manager/vscode.nix
../../modules/home-manager/xdg-user-dirs.nix
@ -21,10 +25,6 @@
home.username = "pomp";
home.homeDirectory = "/home/pomp";
home.file = {
".zshrc".source = ../../home/.zshrc;
".config/starship.toml".source = ../../home/.config/starship.toml;
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

View file

@ -0,0 +1,6 @@
{ ... }:
{
catppuccin.bat.enable = true;
programs.bat.enable = true;
}

View file

@ -0,0 +1,6 @@
{ ... }:
{
programs.btop.enable = true;
catppuccin.btop.enable = true;
}

View file

@ -0,0 +1,8 @@
{ ... }:
{
catppuccin = {
flavor = "frappe";
};
catppuccin.obs.enable = true;
}

View file

@ -5,13 +5,13 @@
meslo-lgs-nf
];
catppuccin.ghostty.enable = true;
programs.ghostty = {
enable = true;
enableZshIntegration = true;
# https://ghostty.org/docs/config/reference
settings = {
theme = "OneHalfDark";
font-size = 11;
font-family = "MesloLGS NF";
background-opacity = 0.75;

View file

@ -6,6 +6,8 @@
lazygit
];
catppuccin.lazygit.enable = true;
programs.git = {
enable = true;
lfs.enable = true;

View file

@ -0,0 +1,79 @@
{ lib, ... }:
{
catppuccin.zsh-syntax-highlighting.enable = true;
programs.zsh = {
enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
c = "clear";
e = "eza --long --classify=always --color=always --icons=always --all --group-directories-first --binary --group --no-time --octal-permissions";
lg = "lazygit";
ld = "lazydocker";
};
sessionVariables = {
# https://nodejs.org/docs/latest/api/cli.html#node_compile_cachedir
NODE_COMPILE_CACHE = "~/.node-compile-cache";
};
};
catppuccin.atuin.enable = true;
programs.atuin = {
enable = true;
enableZshIntegration = true;
};
catppuccin.fzf.enable = true;
programs.fzf = {
enable = true;
enableZshIntegration = true;
};
programs.direnv = {
enable = true;
enableZshIntegration = true;
};
programs.eza = {
enable = true;
enableZshIntegration = true;
};
catppuccin.tmux.enable = true;
programs.tmux.enable = true;
catppuccin.starship.enable = true;
programs.starship = {
enable = true;
enableZshIntegration = true;
settings = {
# https://starship.rs/config
format = lib.concatStrings [
"$directory"
"$character"
];
right_format = lib.concatStrings [
"$all"
];
aws.disabled = true;
bun.format = "[$symbol($version )]($style)";
cmake.format = "[$symbol($version )]($style)";
conda.format = "[$symbol$environment]($style) ";
deno.format = "[$symbol($version )]($style)";
docker_context.format = "[$symbol$context]($style) ";
dotnet.format = "[$symbol($version )(🎯 $tfm )]($style)";
git_branch = {
format = "[$symbol$branch(:$remote_branch)]($style) ";
symbol = " ";
};
golang.format = "[$symbol($version )]($style)";
nix_shell.format = "[$symbol$state( \($name\))]($style) ";
nodejs.format = "[$symbol($version )]($style)";
package.format = "[$symbol$version]($style) ";
python.format = "[$symbol$pyenv_prefix($version )(\($virtualenv\) )]($style)";
rust.format = "[$symbol($version )]($style)";
zig.format = "[$symbol($version )]($style)";
};
};
}

View file

@ -7,7 +7,8 @@
home.file = {
".config/vesktop/settings/settings.json".source = ../../home/.config/vesktop/settings/settings.json;
".config/vesktop/themes/nordic.theme.css".source = ../../home/.config/vesktop/themes/nordic.theme.css;
".config/vesktop/themes/catppuccin-frappe.theme.css".source =
../../home/.config/vesktop/themes/catppuccin-frappe.theme.css;
".config/vesktop/settings.json".source = ../../home/.config/vesktop/settings.json;
};
}

View file

@ -9,6 +9,8 @@
"application/x-zerosize" = "code.desktop";
};
catppuccin.vscode.enable = true;
programs.vscode = {
enable = true;
mutableExtensionsDir = false;
@ -18,7 +20,6 @@
# general
"editor.rulers" = [ 80 ];
"color-highlight.enable" = false;
"workbench.colorTheme" = "One Dark Pro Flat";
"security.workspace.trust.untrustedFiles" = "open";
"window.restoreWindows" = "none";
"extensions.autoUpdate" = false;

View file

@ -4,7 +4,11 @@
# https://nix-community.github.io/nixvim/
programs.nixvim = {
enable = true;
colorschemes.onedark.enable = true;
colorschemes.catppuccin = {
enable = true;
settings.flavour = "frappe";
};
opts = {
number = true;

View file

@ -6,24 +6,5 @@
{
users.users.${user}.shell = pkgs.zsh;
programs.starship.enable = true;
# https://mynixos.com/nixpkgs/options/programs.zsh
programs.zsh = {
enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
c = "clear";
e = "eza --long --classify=always --color=always --icons=always --all --group-directories-first --binary --group --no-time --octal-permissions";
lg = "lazygit";
ld = "lazydocker";
};
};
environment.systemPackages = with pkgs; [
fzf
eza
tmux
atuin
];
programs.zsh.enable = true;
}