hammy
/
dotfiles
mirror of https://github.com/sgoudham/dotfiles.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: hammy:0a3c90ddd27e275740b6880b941fa545dd12b47b
Branches Tags
hammy:main
hammy:chezmoi
..
compare: hammy:922369a51d107ddd2e2150bcc1062b1b84756277
Branches Tags
hammy:main
hammy:chezmoi

No commits in common. '0a3c90ddd27e275740b6880b941fa545dd12b47b' and '922369a51d107ddd2e2150bcc1062b1b84756277' have entirely different histories.
0a3c90ddd2 ... 922369a51d

7 changed files with 110 additions and 83 deletions
Show Stats

102
flake.lock
Unescape Escape View File

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

59
home/apps/fish.nix
Unescape Escape View File

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

12
home/apps/git.nix
Unescape Escape View File

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

2
home/apps/starship/config.toml
Unescape Escape View File

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

12
home/apps/vscode/settings.json
Unescape Escape View File

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

2
home/apps/wezterm/wezterm.lua
Unescape Escape View File

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

4
home/default.nix
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save