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:fd2fafd4d423370427e3c684f3df8f7befdab9fc
Branches Tags
hammy:main
hammy:chezmoi
..
compare: hammy:3f1986277760d91803c920dbe947951a4046aabb
Branches Tags
hammy:main
hammy:chezmoi

No commits in common. 'fd2fafd4d423370427e3c684f3df8f7befdab9fc' and '3f1986277760d91803c920dbe947951a4046aabb' have entirely different histories.
fd2fafd4d4 ... 3f19862777

16 changed files with 70 additions and 217 deletions
Show Stats

165
flake.lock
Unescape Escape View File

@ -1,34 +1,14 @@
{
"nodes": {
"catppuccin-toolbox": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1701205596,
"narHash": "sha256-YwUYVKzOWDdOoQKHiPjScCbAogSZOTyr41L68E5yzG8=",
"owner": "catppuccin",
"repo": "toolbox",
"rev": "7800226205d685d4c03435867dc054ec48922462",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "toolbox",
"type": "github"
}
},
"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 +27,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,
@ -198,24 +178,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=",
@ -230,9 +192,9 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1687709756,
@ -248,7 +210,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -263,9 +225,9 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1687709756,
@ -281,9 +243,9 @@
"type": "github"
}
},
"flake-utils_6": {
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1685518550,
@ -302,9 +264,9 @@
"git-view": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay_3"
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1688345409,
@ -341,7 +303,7 @@
"inputs": {
"flake-parts": "flake-parts_3",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1686721748,
@ -386,11 +348,11 @@
]
},
"locked": {
"lastModified": 1702203126,
"narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
"lastModified": 1697838989,
"narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
"rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
"type": "github"
},
"original": {
@ -428,9 +390,9 @@
"inputs": {
"crane": "crane_2",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"icat": "icat",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"wezterm-src": "wezterm-src"
},
"locked": {
@ -449,7 +411,7 @@
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_5",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
@ -477,7 +439,7 @@
"flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1688601949,
@ -515,16 +477,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1697723726,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
"lastModified": 1688221086,
"narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
"rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -548,22 +510,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1688221086,
"narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1688646010,
"narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=",
@ -579,7 +525,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1686501370,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
@ -595,7 +541,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1688556768,
"narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
@ -611,13 +557,13 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1702151865,
"narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"lastModified": 1697456312,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"type": "github"
},
"original": {
@ -644,42 +590,16 @@
},
"root": {
"inputs": {
"catppuccin-toolbox": "catppuccin-toolbox",
"git-view": "git-view",
"home-manager": "home-manager",
"nekowinston-nur": "nekowinston-nur",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_5",
"nur": "nur"
}
},
"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",
@ -706,7 +626,7 @@
"type": "github"
}
},
"rust-overlay_3": {
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"git-view",
@ -731,7 +651,7 @@
"type": "github"
}
},
"rust-overlay_4": {
"rust-overlay_3": {
"inputs": {
"flake-utils": [
"nekowinston-nur",
@ -818,21 +738,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": {

3
flake.nix
Unescape Escape View File

@ -14,7 +14,6 @@
git-view.url = "github:sgoudham/git-view/v1.0.0";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
catppuccin-toolbox.url = "github:catppuccin/toolbox";
};
nixConfig = {
@ -39,14 +38,12 @@
nix-index-database,
neovim-nightly-overlay,
git-view,
catppuccin-toolbox,
...
}: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
overlays = final: prev: {
git-view = git-view.packages.${system}.default;
whiskers = catppuccin-toolbox.packages.${pkgs.system}.whiskers;
nur = import nur {
nurpkgs = prev;
pkgs = prev;

3
home/apps/deno.nix
Unescape Escape View File

@ -1,8 +1,5 @@
{pkgs, ...}: {
home.packages = with pkgs; [
deno
nodejs_20
yarn-berry
corepack_20
];
}

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

@ -73,24 +73,21 @@ in {
updates.auto_update = true;
};
};
zoxide = {
enable = true;
};
fzf = {
enable = true;
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+" = "#040404";
"fg+" = "#cdd6f4";
"hl+" = "#f38ba8";
border = "#74c7ec";
fg = "#cdd6f4";
header = "#f38ba8";
hl = "#f38ba8";
info = "#cba6f7";
marker = "#f5e0dc";
pointer = "#f5e0dc";
prompt = "#cba6f7";
spinner = "#f5e0dc";
};
defaultOptions = [
"--height 40%"

4
home/apps/ideavim/ideavimrc
Unescape Escape View File

@ -74,6 +74,10 @@ set tm=500
" Set scrolloff
set scrolloff=8
"" Mappings
" 0 -> first non-blank character
map 0 ^
" Center buffer when navigating
nmap <C-u> <C-u>zz
nmap <C-d> <C-d>zz

2
home/apps/nvim/lazy-lock.json
Unescape Escape View File

@ -15,7 +15,6 @@
"dressing.nvim": { "branch": "master", "commit": "169877dbcae54b23b464b219e053e92854bbb37f" },
"friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
"gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" },
"harpoon": { "branch": "harpoon2", "commit": "95c04787c450357ec738b3d8da4b395c808a7a1e" },
"indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
"lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
"ltex_extra.nvim": { "branch": "master", "commit": "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13" },
@ -62,7 +61,6 @@
"typescript.nvim": { "branch": "main", "commit": "de304087e6e49981fde01af8ccc5b21e8519306f" },
"venv-selector.nvim": { "branch": "main", "commit": "cc312074371aff5b0d8d481b80c9c4de2a5287d7" },
"vim-illuminate": { "branch": "master", "commit": "5ed17582a8e97bf0a0c617c3cf762e98f87b9859" },
"vim-just": { "branch": "main", "commit": "ee884dc7d45251d92f5972c4556c12fc101419c0" },
"vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
"vimtex": { "branch": "master", "commit": "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868" },
"which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }

1
home/apps/nvim/lua/config/keymaps.lua
Unescape Escape View File

@ -26,7 +26,6 @@ unmap("n", "<leader>ww")
unmap("n", "<leader>w-")
unmap("n", "<leader>w|")
unmap("n", "<leader>wd")
unmap("n", "<leader>bb")
require("which-key").register({
["<leader>w"] = "which_key_ignore",
})

1
home/apps/nvim/lua/config/lazy.lua
Unescape Escape View File

@ -14,7 +14,6 @@ require("lazy").setup({
{ import = "lazyvim.plugins.extras.util.project" },
{ import = "lazyvim.plugins.extras.dap.core" },
{ import = "lazyvim.plugins.extras.lang.typescript" },
{ import = "lazyvim.plugins.extras.lang.elixir" },
{ import = "lazyvim.plugins.extras.lang.json" },
{ import = "lazyvim.plugins.extras.coding.copilot" },
{ import = "lazyvim.plugins.extras.lang.python" },

4
home/apps/nvim/lua/plugins/colourscheme.lua
Unescape Escape View File

@ -3,13 +3,15 @@ return {
"catppuccin/nvim",
name = "catppuccin",
no_italic = true,
priority = 10000,
opts = {
flavour = "latte",
-- styles = {
-- comments = { "italic" },
-- },
integrations = {
navic = {
custom_bg = "#181825",
},
telescope = {
style = "nvchad",
},

27
home/apps/nvim/lua/plugins/editor.lua
Unescape Escape View File

@ -89,7 +89,7 @@ return {
opts = {
-- TODO: Add in keymaps for <M-hjkl> for toggleterm
open_mapping = [[<C-/]],
direction = "float",
direction = "vertical",
size = vim.o.columns * 0.5,
shade_filetypes = {},
autochdir = true,
@ -110,32 +110,9 @@ return {
})
end,
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = "nvim-lua/plenary.nvim",
keys = function()
local harpoon = require("harpoon")
harpoon:setup()
-- stylua: ignore
return {
{ "<leader>bm", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, desc = "Open Harpoon Menu", },
{ "<leader>bb", function() harpoon:list():append() end, desc = "Add To Harpoon", },
{ "<leader>1", function() harpoon:list():select(1) end },
{ "<leader>2", function() harpoon:list():select(2) end },
{ "<leader>3", function() harpoon:list():select(3) end },
{ "<leader>4", function() harpoon:list():select(4) end },
}
end,
},
{
"windwp/nvim-autopairs",
event = "InsertEnter",
opts = {}, -- this is equivalent to setup({}) function
},
{
"NoahTheDuke/vim-just",
event = { "BufReadPre", "BufNewFile" },
ft = { "\\cjustfile", "*.just", ".justfile" },
opts = {}, -- this is equalent to setup({}) function
},
}

7
home/apps/nvim/lua/plugins/lsp.lua
Unescape Escape View File

@ -38,7 +38,7 @@ return {
keys[#keys + 1] = { "gl", vim.diagnostic.open_float, "Line Diagnostics" }
end,
opts = {
diagnostics = { underline = false, update_in_insert = true },
diagnostics = { underline = false },
inlay_hints = { enabled = true },
autoformat = false,
---@type lspconfig.options
@ -79,7 +79,6 @@ return {
"ltex-ls",
"marksman",
"yaml-language-server",
"elixir-ls",
-- linter
"yamllint",
"jsonlint",
@ -108,8 +107,8 @@ return {
opts.mapping = vim.tbl_extend("force", opts.mapping, {
["<M-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
["<M-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
["<M-p>"] = cmp.mapping.scroll_docs(-4),
["<M-n>"] = cmp.mapping.scroll_docs(4),
["<C-p>"] = cmp.mapping.scroll_docs(-4),
["<C-n>"] = cmp.mapping.scroll_docs(4),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
-- You could replace select_next_item() with confirm({ select = true }) to get VS Code autocompletion behavior

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

@ -21,8 +21,8 @@
"editor.acceptSuggestionOnEnter": "smart",
"editor.formatOnSave": false,
"editor.suggest.preview": true,
// Latex
"latex-workshop.latex.autoBuild.run": "onSave",
"errorLens.fontFamily": "Iosevka Term, Symbols Nerd Font, monospace",
"errorLens.fontWeight": "bold",
// Terminal
"terminal.integrated.defaultProfile.linux": "fish",
"terminal.integrated.fontSize": 14,
@ -306,7 +306,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"explorer.confirmDragAndDrop": false,
"[jsonc]": {
@ -332,7 +332,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
@ -345,10 +345,6 @@
"window.zoomLevel": 1,
"files.autoSaveDelay": 100,
"terminal.integrated.smoothScrolling": true,
"explorer.confirmDelete": false,
"workbench.iconTheme": "catppuccin-latte",
"workbench.colorTheme": "Catppuccin Latte",
"[mdx]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
"workbench.iconTheme": "catppuccin-mocha",
"workbench.colorTheme": "Catppuccin Mocha"
}

20
home/apps/wezterm/binds.lua
Unescape Escape View File

@ -1,4 +1,4 @@
local wezterm = require("wezterm")
local wezterm = require("wezterm")
local act = wezterm.action
return {
@ -34,20 +34,6 @@ return {
{ key = "n", mods = "ALT|SHIFT", action = act({ SpawnTab = "CurrentPaneDomain" }) },
{ key = "m", mods = "ALT|SHIFT", action = act({ SpawnTab = "DefaultDomain" }) },
-- Interactively Rename Tab
{
key = "E",
mods = "ALT|SHIFT",
action = act.PromptInputLine({
description = "New Tab Name",
action = wezterm.action_callback(function(window, _, line)
if line then
window:active_tab():set_title(line)
end
end),
}),
},
-- Open Links Via Keyboard
{
key = "o",
@ -74,5 +60,5 @@ return {
mods = "CTRL",
action = act.OpenLinkAtMouseCursor,
},
},
}
}
}

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

@ -6,7 +6,6 @@ c.set_environment_variables = {
}
c.front_end = "OpenGL"
c.check_for_updates = false
c.term = "wezterm"
c.font = wezterm.font_with_fallback({
{
@ -16,7 +15,7 @@ c.font = wezterm.font_with_fallback({
"Symbols Nerd Font",
"Builtin",
})
c.font_size = 18
c.font_size = 15
c.default_prog = { "fish", "-l" }

2
home/apps/zsh.nix
Unescape Escape View File

@ -4,7 +4,7 @@
...
}: {
programs.zsh = {
enable = false;
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
# Idk why the highlighting doesn't work properly now

2
home/default.nix
Unescape Escape View File

@ -37,8 +37,6 @@
vivid
git-view
nur.repos.nekowinston.icat
whiskers
just
];
home.sessionVariables = {
TERMINAL = "wezterm-gui";

Write Preview
Loading…
Cancel
Save