1
0
Fork 0
forked from foxora/nix

idk i made a lot of changes

This commit is contained in:
foxora 2026-03-19 09:43:51 +00:00
parent f17fb26069
commit 55099cdad2
10 changed files with 171 additions and 21 deletions

View file

@ -154,6 +154,7 @@
element-desktop # 'official' gui matrix client element-desktop # 'official' gui matrix client
blender # AMAZING 3D MODELLING PROGRAMMM <3 blender # AMAZING 3D MODELLING PROGRAMMM <3
session-desktop # idk silly chat app session-desktop # idk silly chat app
localsend # share files locally :3
# media # media
playerctl # mpris cli interface for media apps :3 playerctl # mpris cli interface for media apps :3

View file

@ -31,3 +31,64 @@ end)
vim.keymap.set("n", "<leader>v", function() vim.keymap.set("n", "<leader>v", function()
vim.cmd("vsplit") vim.cmd("vsplit")
end) end)
-- u can put delta inside of neovim omg they are spoiling me <3
local git_diff_win = nil
vim.api.nvim_create_autocmd("VimResized", {
callback = function()
if git_diff_win and vim.api.nvim_win_is_valid(git_diff_win) then
local width = math.floor(vim.o.columns * 0.9)
local height = math.floor((vim.o.lines - 2) * 0.9)
vim.api.nvim_win_set_config(git_diff_win, {
relative = "editor",
width = width,
height = height,
col = math.floor((vim.o.columns - width) / 2),
row = math.floor((vim.o.lines - height) / 2) - 2,
})
end
end,
})
vim.keymap.set("n", "<leader>gd", function()
if git_diff_win and vim.api.nvim_win_is_valid(git_diff_win) then
vim.api.nvim_win_close(git_diff_win, true)
git_diff_win = nil
return
end
local buf = vim.api.nvim_create_buf(false, true)
vim.bo[buf].filetype = "terminal"
-- deletes the last two lines of the buffer when the process exits :3
vim.api.nvim_create_autocmd("TermClose", {
buffer = buf,
callback = function()
vim.defer_fn(function()
vim.bo[buf].modifiable = true
vim.api.nvim_buf_set_lines(buf, -3, -1, false, {})
vim.bo[buf].modifiable = false
end, 10)
end,
})
local width = math.floor(vim.o.columns * 0.9)
local height = math.floor((vim.o.lines - 2) * 0.9)
git_diff_win = vim.api.nvim_open_win(buf, true, {
relative = "editor",
width = width,
height = height,
col = math.floor((vim.o.columns - width) / 2),
row = math.floor((vim.o.lines - height) / 2) - 2,
style = "minimal",
border = "rounded",
})
vim.fn.jobstart("git diff | delta --pager=never", { term = true })
vim.keymap.set("n", "q", "<cmd>close<CR>", { buffer = buf })
end)

View file

@ -75,6 +75,16 @@ local function load_colors()
local bg_90 = blend_colors(hex_to_int("#000000"), hex_to_int(bg), 0.90) local bg_90 = blend_colors(hex_to_int("#000000"), hex_to_int(bg), 0.90)
local fg_10 = blend_colors(hex_to_int(bg), hex_to_int(fg), 0.10)
local fg_30 = blend_colors(hex_to_int(bg), hex_to_int(fg), 0.30)
local secondary_10 = blend_colors(hex_to_int(bg), hex_to_int(color_13), 0.10)
local secondary_30 = blend_colors(hex_to_int(bg), hex_to_int(color_13), 0.30)
-- editor colors :3 --------------------------------------------------------
vim.api.nvim_set_hl(0, "Visual", { bg = secondary_10 })
-- blink.cmp --------------------------------------------------------------- -- blink.cmp ---------------------------------------------------------------
vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = bg }) vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = bg })
@ -191,6 +201,15 @@ local function load_colors()
vim.api.nvim_set_hl(0, "FylerGitUntracked", { fg = color_06 }) vim.api.nvim_set_hl(0, "FylerGitUntracked", { fg = color_06 })
vim.api.nvim_set_hl(0, "FylerWinPick", { fg = color_15, bg = fg }) vim.api.nvim_set_hl(0, "FylerWinPick", { fg = color_15, bg = fg })
-- lualine.nvim
vim.api.nvim_exec_autocmds("User", { pattern = "RefreshLualine" })
-- indent-blankline.nvim
vim.api.nvim_set_hl(0, "IblIndent", { fg = secondary_30 })
vim.api.nvim_set_hl(0, "IblScope", { fg = color_11 })
vim.api.nvim_exec_autocmds("User", { pattern = "RefreshIndentBlankline" })
vim.api.nvim_set_hl(0, "@ibl.scope.underline.1", { underline = false })
else else
print("Error: Not enough colors in file") print("Error: Not enough colors in file")
end end
@ -218,3 +237,9 @@ local function watch_colorscheme()
end end
watch_colorscheme() watch_colorscheme()
vim.api.nvim_create_autocmd("VimLeave", {
callback = function()
io.write("\027]112\007")
end,
})

View file

@ -1,5 +1,6 @@
return { return {
{ {
"dressing.nvim", "dressing.nvim",
enabled = nixCats("ui.dressing") or false,
}, },
} }

View file

@ -0,0 +1,30 @@
local config = {
debounce = 25,
indent = {
char = "",
smart_indent_cap = true,
},
scope = {
show_start = true,
show_end = true,
show_exact_scope = false,
injected_languages = true,
},
}
return {
{
"indent-blankline.nvim",
enabled = nixCats("ui.indent-blankline") or false,
after = function(plugin)
require("ibl").setup(config)
vim.api.nvim_create_autocmd("User", {
pattern = "RefreshIndentBlankline",
callback = function()
require("ibl").setup(config)
end,
})
end,
},
}

View file

@ -7,4 +7,6 @@ require("lze").load({
{ import = "plugins.format" }, { import = "plugins.format" },
{ import = "plugins.comment" }, { import = "plugins.comment" },
{ import = "plugins.git" }, { import = "plugins.git" },
{ import = "plugins.lualine" },
{ import = "plugins.indent-blankline" },
}) })

View file

@ -0,0 +1,22 @@
local config = {
options = {
theme = "auto",
},
}
return {
{
"lualine.nvim",
enabled = nixCats("ui.lualine") or false,
after = function(plugin)
require("lualine").setup(config)
vim.api.nvim_create_autocmd("User", {
pattern = "RefreshLualine",
callback = function()
require("lualine").setup(config)
end,
})
end,
},
}

View file

@ -60,6 +60,14 @@ return {
mode = { "n" }, mode = { "n" },
desc = "[T]elescope [H]ighlights", desc = "[T]elescope [H]ighlights",
}, },
{
"<leader>gs",
function()
return require("telescope.builtin").git_status()
end,
mode = { "n" },
desc = "[G]it [S]tatus",
},
}, },
load = function(name) load = function(name)
vim.cmd.packadd(name) vim.cmd.packadd(name)

View file

@ -15,11 +15,10 @@ in {
]; ];
config = { config = {
# this value, nixCats is the defaultPackageName you pass to mkNixosModules
# it will be the namespace for your options.
nixCats = { nixCats = {
enable = true; enable = true;
nixpkgs_version = inputs.nixpkgs-unstable; nixpkgs_version = inputs.nixpkgs-unstable;
# TODO: ask butterfly about this, am confused :3
# this will add the overlays from ./overlays and also, # this will add the overlays from ./overlays and also,
# add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins # add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins
# It will not apply to overall system, just nixCats. # It will not apply to overall system, just nixCats.
@ -28,15 +27,13 @@ in {
[ [
(utils.standardPluginOverlay inputs) (utils.standardPluginOverlay inputs)
]; ];
# see the packageDefinitions below.
# This says which of those to install. # This says which of those to install.
packageNames = ["auroranvim"]; packageNames = ["auroranvim"];
luaPath = "${./.}"; luaPath = "${./.}";
# the .replace vs .merge options are for modules based on existing configurations, # for usage of this section, refer to :h nixCats.flake.outputs.categories
# they refer to how multiple categoryDefinitions get merged together by the module.
# for useage of this section, refer to :h nixCats.flake.outputs.categories
categoryDefinitions.replace = { categoryDefinitions.replace = {
pkgs, pkgs,
settings, settings,
@ -126,9 +123,11 @@ in {
optionalPlugins = with pkgs.vimPlugins; { optionalPlugins = with pkgs.vimPlugins; {
general = []; general = [];
ui = [ ui = {
dressing-nvim dressing = [dressing-nvim];
]; lualine = [lualine-nvim];
indent-blankline = [indent-blankline-nvim];
};
qol = [ qol = [
undotree undotree
mini-hipatterns mini-hipatterns
@ -187,9 +186,7 @@ in {
# shared libraries to be added to LD_LIBRARY_PATH # shared libraries to be added to LD_LIBRARY_PATH
# variable available to nvim runtime # variable available to nvim runtime
sharedLibraries = { sharedLibraries = {
general = with pkgs; [ general = with pkgs; [];
# libgit2
];
}; };
environmentVariables = { environmentVariables = {
@ -225,15 +222,11 @@ in {
# see :help nixCats.flake.outputs.packageDefinitions # see :help nixCats.flake.outputs.packageDefinitions
packageDefinitions.replace = { packageDefinitions.replace = {
# these are the names of your packages
# you can include as many as you wish.
auroranvim = {pkgs, ...}: { auroranvim = {pkgs, ...}: {
# they contain a settings set defined above # they contain a settings set defined above
# see :help nixCats.flake.outputs.settings # see :help nixCats.flake.outputs.settings
settings = { settings = {
wrapRc = true; wrapRc = true;
# IMPORTANT:
# your alias may not conflict with your other packages.
aliases = [ aliases = [
"auravim" "auravim"
"foxyvim" "foxyvim"
@ -241,20 +234,24 @@ in {
"fvix" "fvix"
]; ];
}; };
# and a set of categories that you want
# (and other information to pass to lua)
categories = { categories = {
general = true; general = true;
ui = true; ui = {
dressing = true;
lualine = true;
indent-blankline = true;
};
qol = true; qol = true;
telescope = { telescope = {
enable = true; enable = true;
# only enable one at a time # only enable one at a time
fzf = false; fzf = true;
zf = true; zf = false;
}; };
fyler = true; fyler = true;

View file

@ -51,6 +51,9 @@
cb-fox = "ssh-add ~/.ssh/codeberg_foxxyora"; cb-fox = "ssh-add ~/.ssh/codeberg_foxxyora";
tf-fox = "ssh-add ~/.ssh/tearforge_foxora"; tf-fox = "ssh-add ~/.ssh/tearforge_foxora";
tx = "wormhole-rs tx";
rx = "wormhole-rs rx";
# -------------------- # --------------------
# shorthand nix command aliases # shorthand nix command aliases