This commit is contained in:
zack 2024-12-16 16:39:20 -05:00
parent e4da7e87fe
commit ed77ae6e6b
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
18 changed files with 800 additions and 583 deletions

View file

@ -21,19 +21,19 @@ with lib.custom; let
ripgrep
util-linux
gtksourceview
webkitgtk
webkitgtk_4_1
brightnessctl
gvfs
accountsservice
swww
gnome.gnome-control-center
gnome.nautilus
gnome.totem
gnome-control-center
nautilus
totem
loupe
];
guiDeps = with pkgs; [
gnome.gnome-control-center
gnome-control-center
overskride
wlogout
];

View file

@ -13,6 +13,7 @@
"lazyvim.plugins.extras.lang.java",
"lazyvim.plugins.extras.lang.toml",
"lazyvim.plugins.extras.lang.json",
"lazyvim.plugins.extras.lang.clangd",
"lazyvim.plugins.extras.lang.markdown",
"lazyvim.plugins.extras.lang.nix",
"lazyvim.plugins.extras.lang.sql",
@ -26,8 +27,7 @@
"lazyvim.plugins.extras.util.dot",
"lazyvim.plugins.extras.util.mini-hipatterns",
"lazyvim.plugins.extras.coding.luasnip",
"lazyvim.plugins.extras.coding.blink",
"lazyvim.plugins.extras.ai.supermaven"
"lazyvim.plugins.extras.coding.blink"
],
"news": {
"NEWS.md": "6520"

View file

@ -6,3 +6,6 @@ if vim.g.neovide then
-- Put anything you want to happen only in Neovide here
vim.o.guifont = "Iosevka,Noto_Color_Emoji:h14:b"
end
-- in this case.
-- vim.g.lazyvim_blink_main = true

View file

@ -6,6 +6,12 @@ return {
news = { lazyvim = false },
},
},
{
"catppuccin",
opts = { transparent_background = true, integrations = {
blink_cmp = true,
} },
},
"f-person/git-blame.nvim",
{ "nvim-lualine/lualine.nvim", enabled = false },
{ "echasnovski/mini.statusline", opts = {} },
@ -25,7 +31,7 @@ return {
{
"saghen/blink.cmp",
opts = {
nerd_font_variant = "normal",
nerd_font_variant = "mono",
},
},
{
@ -38,6 +44,20 @@ return {
"sphamba/smear-cursor.nvim",
opts = {},
},
{
"folke/snacks.nvim",
priority = 1000,
lazy = false,
keys = {
{
"<leader>z",
function()
Snacks.zen()
end,
desc = "Toggle Zen Mode",
},
},
},
{
"lukas-reineke/indent-blankline.nvim",
main = "ibl",

View file

@ -0,0 +1,43 @@
return {
"sethen/line-number-change-mode.nvim",
config = function()
require("catppuccin").setup({
flavour = "mocha",
})
local palette = require("catppuccin.palettes").get_palette("mocha")
if palette == nil then
return nil
end
require("line-number-change-mode").setup({
mode = {
i = {
bg = palette.green,
fg = palette.mantle,
bold = true,
},
n = {
bg = palette.blue,
fg = palette.mantle,
bold = true,
},
R = {
bg = palette.maroon,
fg = palette.mantle,
bold = true,
},
v = {
bg = palette.mauve,
fg = palette.mantle,
bold = true,
},
V = {
bg = palette.mauve,
fg = palette.mantle,
bold = true,
},
},
})
end,
}

View file

@ -0,0 +1,4 @@
return {
"echasnovski/mini.ai",
version = false,
}

View file

@ -0,0 +1,5 @@
return {
"marcussimonsen/let-it-snow.nvim",
cmd = "LetItSnow", -- Wait with loading until command is run
opts = {},
}

View file

@ -0,0 +1,8 @@
return {
"gbprod/substitute.nvim",
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
},
}

View file

@ -56,7 +56,7 @@ in {
lua-language-server
nixd
(pkgs.rust-bin.selectLatestNightlyWith
(toolchain: toolchain.minimal))
(toolchain: toolchain.default))
rust-analyzer
vscode-langservers-extracted
nodePackages.vscode-json-languageserver

View file

@ -24,7 +24,7 @@ in {
SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
FLAKE = "/home/zoey/nixos/";
};
enableAutosuggestions = true;
# zprof.enable = true;
history = {
save = 2137;
size = 2137;
@ -39,10 +39,9 @@ in {
"${zsh-history}/share/zsh/init.zsh"
"${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
"${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh"
# "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh"
"${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh"
"${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh"
"${oh-my-zsh}/share/oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh"
"${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
];
source = map (source: "source ${source}") sources;
@ -52,6 +51,7 @@ in {
]
++ source);
in ''
${plugins}
export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import <nixpkgs> {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD')
@ -60,28 +60,13 @@ in {
bindkey "^[[1;5D" backward-word
'';
plugins = [
{
name = "zsh-tmux";
file = "zsh-tmux.plugin.zsh";
src = pkgs.fetchFromGitHub {
owner = "laggardkernel";
repo = "zsh-tmux";
rev = "v1.1.0";
sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8=";
};
}
{
name = "zsh-autocomplete";
file = "zsh-autocomplete.plugin.zsh";
src = pkgs.fetchFromGitHub {
owner = "marlonrichert";
repo = "zsh-autocomplete";
rev = "008caaea55780dd2b55f119d6880c5b89e5e4bb2";
sha256 = "sha256-jibIHwT/oVQUSxVrT0SGFSMu1N05szPyHZ4Qc7v6Ntc=";
};
}
];
# oh my zsh
oh-my-zsh = {
enable = true;
plugins = [
"colored-man-pages"
];
};
dirHashes = {
music = "$HOME/Music";

View file

@ -99,7 +99,7 @@ in {
"${mod},X,exec, ags --toggle-window \"dashboard\""
"${mod},Print,exec,${lib.getExe pkgs.custom.sc}"
"${mod},Shift&Print,exec,${lib.getExe pkgs.wf-recorder} -g \"$(${lib.getExe pkgs.slurp})\" -f out.mp4"
"${mod},Shift&Print,exec,\"${lib.getExe pkgs.grim} -g ${lib.getExe pkgs.slurp} | wl-copy\""
"${modshift},O,exec,wl-ocr"
"${mod},Period,exec, tofi-emoji"