Compare commits

...

6 Commits

@ -2,16 +2,14 @@
"nodes": {
"catppuccin-toolbox": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1701205596,
"narHash": "sha256-YwUYVKzOWDdOoQKHiPjScCbAogSZOTyr41L68E5yzG8=",
"lastModified": 1707351223,
"narHash": "sha256-kRc9+s3sJyoOOPAlS8Vo9aghzyVUlti43A+hDLdnimM=",
"owner": "catppuccin",
"repo": "toolbox",
"rev": "7800226205d685d4c03435867dc054ec48922462",
"rev": "bf01699b19d59c1a2899d63e8ed7d6bc2865842a",
"type": "github"
},
"original": {
@ -23,12 +21,12 @@
"crane": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": [
"git-view",
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1688082682,
@ -47,12 +45,12 @@
"crane_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nekowinston-nur",
"nixpkgs"
],
"rust-overlay": "rust-overlay_4"
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1676846788,
@ -179,24 +177,6 @@
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1687709756,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
@ -211,9 +191,9 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1687709756,
@ -229,7 +209,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -244,9 +224,9 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1687709756,
@ -262,9 +242,9 @@
"type": "github"
}
},
"flake-utils_6": {
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1701680307,
@ -283,9 +263,9 @@
"git-view": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay_3"
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1688345409,
@ -373,7 +353,7 @@
"inputs": {
"crane": "crane_2",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"icat": "icat",
"nixpkgs": "nixpkgs_3",
"wezterm-src": "wezterm-src"
@ -394,7 +374,7 @@
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_5",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
@ -566,31 +546,6 @@
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"catppuccin-toolbox",
"flake-utils"
],
"nixpkgs": [
"catppuccin-toolbox",
"nixpkgs"
]
},
"locked": {
"lastModified": 1697940838,
"narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a3e829c06eadf848f13d109c7648570ce37ebccd",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"git-view",
@ -617,7 +572,7 @@
"type": "github"
}
},
"rust-overlay_3": {
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"git-view",
@ -642,7 +597,7 @@
"type": "github"
}
},
"rust-overlay_4": {
"rust-overlay_3": {
"inputs": {
"flake-utils": [
"nekowinston-nur",
@ -729,21 +684,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm-src": {
"flake": false,
"locked": {

@ -14,22 +14,22 @@ in {
themepkg = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
rev = "main";
sha256 = "sha256-PWX8LR3xTgNBUpk+xBIGpEBQCNJHre8cRX4OTSWkZvs=";
};
in {
enable = true;
config.theme = "Catppuccin-latte";
config.theme = "Catppuccin Mocha";
themes = let
getTheme = flavour: "Catppuccin-${flavour}.tmTheme";
getTheme = flavour: "/themes/Catppuccin ${flavour}.tmTheme";
in {
Catppuccin-latte = {
"Catppuccin Latte" = {
src = themepkg;
file = getTheme "latte";
file = getTheme "Latte";
};
Catppuccin-mocha = {
"Catppuccin Mocha" = {
src = themepkg;
file = getTheme "mocha";
file = getTheme "Mocha";
};
};
};
@ -78,20 +78,36 @@ in {
};
fzf = {
enable = true;
# Mocha
colors = {
"bg+" = "#e6e9ef";
"fg+" = "#4c4f69";
"hl+" = "#d20f39";
border = "#04a5e5";
fg = "#4c4f69";
header = "#d20f39";
hl = "#d20f39";
info = "#8839ef";
marker = "#dc8a78";
pointer = "#dc8a78";
prompt = "#8839ef";
spinner = "#dc8a78";
"bg+" = "#1e1e2e";
"fg+" = "#cdd6f4";
"hl+" = "#f38ba8";
border = "#89b4fa";
fg = "#cdd6f4";
header = "#f38ba8";
hl = "#f38ba8";
info = "#cba6f7";
marker = "#f5e0dc";
pointer = "#f5e0dc";
prompt = "#cba6f7";
spinner = "#f5e0dc";
};
# Latte
# colors = {
# "bg+" = "#e6e9ef";
# "fg+" = "#4c4f69";
# "hl+" = "#d20f39";
# border = "#04a5e5";
# fg = "#4c4f69";
# header = "#d20f39";
# hl = "#d20f39";
# info = "#8839ef";
# marker = "#dc8a78";
# pointer = "#dc8a78";
# prompt = "#8839ef";
# spinner = "#dc8a78";
# };
defaultOptions = [
"--height 40%"
"--reverse"
@ -132,6 +148,7 @@ in {
gra = "git rebase --abort";
grc = "git rebase --continue";
gs = "git switch";
gsc = "git switch --create";
gst = "git status";
# Rust
@ -313,7 +330,7 @@ in {
bind -s --user -M insert \e "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f repaint-mode; end"
yes | fish_config theme save "Catppuccin Latte"
yes | fish_config theme save "Catppuccin Mocha"
'';
plugins = [

@ -35,12 +35,22 @@
"node_modules/"
];
extraConfig = {
push.autoSetupRemote = true;
branch.sort = "-committerdate";
core = {
autocrlf = "input";
editor = "nvim";
};
commit.verbose = true;
fetch = {
fsckobjects = true;
prune = true;
prunetags = true;
};
init.defaultBranch = "main";
merge.conflictstyle = "zdiff3";
push.autoSetupRemote = true;
receive.fsckObjects = true;
transfer.fsckobjects = true;
};
};
}

@ -1,7 +1,7 @@
# Get editor completions based on the config schema
"$schema" = 'https://starship.rs/config-schema.json'
palette = "catppuccin_latte"
palette = "catppuccin_mocha"
format = """
┌ \
$username\

@ -295,7 +295,7 @@
"editor.defaultFormatter": "ms-python.black-formatter"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
@ -346,9 +346,13 @@
"files.autoSaveDelay": 100,
"terminal.integrated.smoothScrolling": true,
"explorer.confirmDelete": false,
"workbench.iconTheme": "catppuccin-latte",
"workbench.colorTheme": "Catppuccin Latte",
"workbench.iconTheme": "catppuccin-mocha",
"workbench.colorTheme": "Catppuccin Mocha",
"[mdx]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
},
"[astro]": {
"editor.defaultFormatter": "astro-build.astro-vscode"
},
"diffEditor.renderSideBySide": false
}

@ -100,6 +100,6 @@ custom.tab_bar.new_tab.bg_color = "#080808"
c.color_schemes = {
["OLEDppuccin"] = custom,
}
c.color_scheme = "Catppuccin Latte"
c.color_scheme = "Catppuccin Mocha"
return c

@ -43,7 +43,7 @@
home.sessionVariables = {
TERMINAL = "wezterm-gui";
LIBVA_DRIVER_NAME = "iHD";
LS_COLORS = "$(vivid generate catppuccin-latte)";
LS_COLORS = "$(vivid generate catppuccin-mocha)";
JAVA_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/current";
GRAALVM_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/22.3.r17-grl";
};
@ -53,6 +53,8 @@
];
home.shellAliases = {
magit = "nvim '+Neogit kind=replace'";
cat = "bat";
mv = "mv -iv";
};
xdg.configFile."ideavim/ideavimrc".source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/ideavim/ideavimrc";

Loading…
Cancel
Save