Skip to content

Commit

Permalink
chore: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
folke committed Jul 15, 2024
1 parent 1f0adc6 commit 13b8ed8
Show file tree
Hide file tree
Showing 20 changed files with 314 additions and 194 deletions.
1 change: 0 additions & 1 deletion config/ags/style/widgets/bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ $button-radius: $radius;

label,
image {
// font-weight: bold;
color: white;
}

Expand Down
1 change: 1 addition & 0 deletions config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ alias bt "coredumpctl -1 gdb -A '-ex \"bt\" -q -batch' 2>/dev/null | awk '/Progr
abbr git hub
abbr topgit topgrade --only git_repos
abbr g hub
abbr windows systemctl reboot --boot-loader-entry=auto-windows

set -x LG_CONFIG_FILE /home/folke/.config/lazygit/config.yml,/home/folke/.cache/nvim/lazygit-theme.yml

Expand Down
3 changes: 3 additions & 0 deletions config/fish/functions/calc.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function calc --wraps numbat
numbat --pretty-print=always -e $argv
end
1 change: 1 addition & 0 deletions config/hypr/hyprland.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ windowrule = fullscreen, title:wlogout
windowrulev2 = float,class:quake
windowrulev2 = center,class:quake
windowrulev2 = dimaround,class:quake
windowrulev2 = noanim,class:quake
windowrulev2 = size 1400 875,class:quake
windowrulev2 = idleinhibit fullscreen,class:microsoft-edge
windowrulev2 = idleinhibit fullscreen,class:Brave-browser
Expand Down
2 changes: 1 addition & 1 deletion config/hypr/hyprlock.conf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ input-field {
# TIME
label {
monitor =
text = cmd[update:1000] echo "$(date +"%-I:%M%p")"
text = cmd[update:1000] echo "$(date +"%-H:%M")"
font_size = 120
font_family = Maple Mono Bold
position = 0, -300
Expand Down
2 changes: 1 addition & 1 deletion config/hypr/hyprvars.conf
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ dwindle {
}

master {
new_is_master = true
new_status = "master"
}

gestures {
Expand Down
2 changes: 2 additions & 0 deletions config/wezterm/keys.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ function M.setup(config)
{ mods = M.mod, key = "Enter", action = M.smart_split },
{ mods = M.mod, key = "|", action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }) },
{ mods = M.mod, key = "_", action = act.SplitVertical({ domain = "CurrentPaneDomain" }) },
{ mods = M.mod, key = "(", action = act.DecreaseFontSize },
{ mods = M.mod, key = ")", action = act.IncreaseFontSize },
-- Move Tabs
{ mods = M.mod, key = ">", action = act.MoveTabRelative(1) },
{ mods = M.mod, key = "<", action = act.MoveTabRelative(-1) },
Expand Down
2 changes: 1 addition & 1 deletion config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ else
end

-- Fonts
config.font_size = 11
config.font_size = 10
config.font = wezterm.font({ family = "Fira Code" })
config.bold_brightens_ansi_colors = true
config.font_rules = {
Expand Down
32 changes: 30 additions & 2 deletions nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,39 @@ if vim.env.VSCODE then
vim.g.vscode = true
end

-- vim.loader = false
if vim.loader then
vim.loader.enable()
end

-- local cache_root = vim.fn.stdpath("cache") .. "/fast"
-- local _, cache = pcall(function()
-- return loadfile(cache_root .. "/cache.lua")()
-- end)
-- cache = cache or {}
-- table.insert(package.loaders, 2, function(mod)
-- local file = cache[mod]
-- if file then
-- local chunk, err = loadfile(file)
-- return chunk, err
-- else
-- -- vim.schedule(function()
-- -- dd(mod)
-- -- end)
-- end
-- end)
--
-- vim.api.nvim_create_autocmd("VimLeavePre", {
-- callback = function(ev)
-- vim.fn.mkdir(cache_root, "p")
-- cache = {}
-- for modname in pairs(package.loaded) do
-- local info = vim.loader.find(modname)[1]
-- cache[modname] = info and info.modpath or nil
-- end
-- require("lazy.util").write_file(cache_root .. "/cache.lua", "return " .. vim.inspect(cache))
-- end,
-- })

_G.dd = function(...)
require("util.debug").dump(...)
end
Expand All @@ -23,7 +51,7 @@ require("config.lazy")({
-- debug = false,
profiling = {
loader = false,
require = false,
require = true,
},
})

Expand Down
53 changes: 27 additions & 26 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,65 @@
{
"CopilotChat.nvim": { "branch": "canary", "commit": "82923efe22b604cf9c0cad0bb2a74aa9247755ab" },
"SchemaStore.nvim": { "branch": "main", "commit": "30946db59edba23103c2f524e636910a7a2160df" },
"bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" },
"CopilotChat.nvim": { "branch": "canary", "commit": "6f143f210efd1f16d97c077b945c76b7d5fd0f8b" },
"SchemaStore.nvim": { "branch": "main", "commit": "82db29c48789e6b61bd2ba78df8ffd7bf66470d9" },
"bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" },
"busted-types": { "branch": "main", "commit": "5ed85d0e016a5eb5eca097aa52905eedf1b180f1" },
"catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" },
"catppuccin": { "branch": "main", "commit": "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" },
"cmp-git": { "branch": "main", "commit": "22116bdffbe68bfc6ca05d52e9f217587cbfea8b" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
"copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
"copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" },
"dashboard-nvim": { "branch": "master", "commit": "e6e33b848f0e2fe5c13f6553c568764555c390a3" },
"dial.nvim": { "branch": "master", "commit": "750f802879c90ea51f92b68c35fa562ee575804a" },
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
"fzf-lua": { "branch": "main", "commit": "3b91c1a471160bd8620bdca8f18743d954994daa" },
"dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
"dial.nvim": { "branch": "master", "commit": "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490" },
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
"fzf-lua": { "branch": "main", "commit": "3d214f8db4a4119723ab5148b7a333aab3fa9063" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
"inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
"indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
"log-highlight.nvim": { "branch": "main", "commit": "c18d1fd20c411f9fd9702d6d0d09edf3faa2bb96" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
"luassert-types": { "branch": "main", "commit": "d3528bb679302cbfdedefabb37064515ab95f7b9" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"markview.nvim": { "branch": "main", "commit": "4fbeb21d703dbfa30ebd289d260ffd47835a207c" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
"mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" },
"mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
"mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" },
"mini.animate": { "branch": "main", "commit": "320fb35460238c436407cd779f63abad98e84870" },
"mini.diff": { "branch": "main", "commit": "d052bf31cc01bb1dde0afd129d8dcdd9f36b9d35" },
"mini.diff": { "branch": "main", "commit": "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6" },
"mini.hipatterns": { "branch": "main", "commit": "aa68eb143ce77a57b6416fb4bd71ee0adba5a517" },
"mini.icons": { "branch": "main", "commit": "3c51394b8815e0cb9beb385909803cd4816951c4" },
"mini.icons": { "branch": "main", "commit": "9d9d21868841ce0a26fb2b8ef0eba7021055145c" },
"mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
"mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" },
"mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
"mini.test": { "branch": "main", "commit": "1c4882f339e563d35316d67bb9201bf052d36dfb" },
"neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" },
"neotest": { "branch": "master", "commit": "26ed90509c377d10dbdebd25b7094a886323b32b" },
"neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" },
"neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" },
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" },
"nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
"nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" },
"nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
"nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" },
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
"nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" },
"nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" },
"nvim-treesitter": { "branch": "master", "commit": "f7c05e3e0510df7c742d455c802e27b6ee7ab384" },
"nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
"nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" },
"nvim-treesitter": { "branch": "master", "commit": "a6b2f4ecc8a47011868632142a9b687d7e0f9aaf" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
"nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
"nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" },
"octo.nvim": { "branch": "master", "commit": "aa5dfa573220a0a511a25ee14ce1570b6c23e56a" },
"perfanno.nvim": { "branch": "master", "commit": "b138718bf4289b429dc81cadaf80ace8221c647b" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"qmk.nvim": { "branch": "main", "commit": "cfa6cecae362d23778cd97317d33ab12671e157c" },
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
"telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" },
"tree-sitter-caddy": { "branch": "master", "commit": "65b60437983933d00809c8927e7d8a29ca26dfa3" },
"tree-sitter-just": { "branch": "main", "commit": "379fbe36d1e441bc9414ea050ad0c85c9d6935ea" },
"treesj": { "branch": "main", "commit": "6e8bd008bacd5ad001c3953017c1dca20709e915" },
"venv-selector.nvim": { "branch": "regexp", "commit": "9cbb76e10abed4fff32d015472e7996fd999c996" },
"treesj": { "branch": "main", "commit": "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2" },
"venv-selector.nvim": { "branch": "regexp", "commit": "542a38a4e673476119f6877eff8dce9a74142d49" },
"wezterm-types": { "branch": "main", "commit": "1518752906ba3fac0060d9efab6e4d3ec15d4b5a" },
"yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" }
}
}
2 changes: 1 addition & 1 deletion nvim/lazyvim.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
"news": {
"NEWS.md": "6077",
"doc/news.txt": "5244"
"doc/news.txt": "5633"
},
"version": 6
}
1 change: 1 addition & 0 deletions nvim/lua/config/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ return function(opts)
diff = {
cmd = "terminal_git",
},
rocks = { hererocks = true },
performance = {
cache = {
enabled = true,
Expand Down
17 changes: 12 additions & 5 deletions nvim/lua/plugins/coding.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,19 @@ return {
},
opts = { use_default_keymaps = false, max_join_length = 150 },
},
{ "nvim-neotest/neotest-plenary" },
{ "marilari88/neotest-vitest" },
-- { "nvim-neotest/neotest-plenary" },
-- { "marilari88/neotest-vitest" },
{
"nvim-neotest/neotest",
opts = { adapters = { ["neotest-plenary"] = {
min_init = "./tests/init.lua",
}, "neotest-vitest" } },
opts = {
adapters = {
-- ["neotest-plenary"] = { min_init = "./tests/init.lua" },
-- "neotest-vitest",
-- ["neotest-busted"] = {
-- busted_command = "./tests/minit.lua",
-- busted_args = { "--busted" },
-- },
},
},
},
}
12 changes: 3 additions & 9 deletions nvim/lua/plugins/colorscheme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@ return {
"tokyonight.nvim",
opts = function()
return {
style = "moon",
-- style = "day",
-- light_style = "moon",
-- transparent = true,
-- styles = {
-- sidebars = "transparent",
-- floats = "transparent",
-- },
sidebars = {
"qf",
"vista_kind",
-- "terminal",
"spectre_panel",
"startuptime",
"Outline",
},
on_highlights = function(hl, c)
-- hl.Normal = "Foo"
do
return
end
Expand Down
Loading

0 comments on commit 13b8ed8

Please sign in to comment.