varris
/
nixos-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Varris 2023-12-21 20:18:51 +01:00
parent 8bb68610dd
commit 632d3111de
20 changed files with 299 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
flake.lock
View File

@ -156,7 +156,9 @@
},
"home-manager_2": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1703113038,
@ -176,7 +178,7 @@
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"systems": "systems_2",
"wlroots": "wlroots",
"xdph": "xdph"
@ -197,7 +199,7 @@
},
"hyprland-contrib": {
"inputs": {
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1702242899,
@ -240,7 +242,7 @@
},
"hyprpicker": {
"inputs": {
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1698684516,
@ -256,26 +258,11 @@
"type": "github"
}
},
"mygui-git": {
"flake": false,
"locked": {
"lastModified": 1691358308,
"narHash": "sha256-qif9trHgtWpYiDVXY3cjRsXypjjjgStX8tSWCnXhXlk=",
"owner": "mygui",
"repo": "MyGUI",
"rev": "dae9ac4be5a09e672bec509b1a8552b107c40214",
"type": "github"
},
"original": {
"owner": "mygui",
"repo": "MyGUI",
"rev": "dae9ac4be5a09e672bec509b1a8552b107c40214",
"type": "github"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1702864432,
@ -293,11 +280,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1693471703,
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github"
},
"original": {
@ -338,11 +325,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1701718080,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github"
},
"original": {
@ -353,22 +340,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1658161305,
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
@ -384,7 +355,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
@ -400,23 +371,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_6": {
"locked": {
"lastModified": 1703068421,
"narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
@ -431,38 +386,6 @@
"type": "indirect"
}
},
"nvim-hmts": {
"flake": false,
"locked": {
"lastModified": 1693226725,
"narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
"owner": "calops",
"repo": "hmts.nvim",
"rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
"type": "github"
},
"original": {
"owner": "calops",
"repo": "hmts.nvim",
"type": "github"
}
},
"openmw-git": {
"flake": false,
"locked": {
"lastModified": 1703142516,
"narHash": "sha256-t/pB/MpTZZ/7BJY2pw21UgW2+MWd8OKFpqaKPoITtyA=",
"owner": "OpenMW",
"repo": "openmw",
"rev": "51cb3b08cb194decd92132b81f7776f2779afa57",
"type": "gitlab"
},
"original": {
"owner": "OpenMW",
"repo": "openmw",
"type": "gitlab"
}
},
"root": {
"inputs": {
"ags": "ags",
@ -475,12 +398,9 @@
"hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib",
"hyprpicker": "hyprpicker",
"mygui-git": "mygui-git",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_8",
"nixpkgs-unstable": "nixpkgs-unstable",
"nvim-hmts": "nvim-hmts",
"openmw-git": "openmw-git"
"nixpkgs": "nixpkgs_6",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"systems": {

46
flake.nix
View File

@ -3,51 +3,33 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11";
home-manager.url = "github:nix-community/home-manager/release-23.11";
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
chaotic-nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/hyprland";
hyprland-contrib.url = "github:hyprwm/contrib";
hyprpicker.url = "github:hyprwm/hyprpicker";
ags.url = "github:Aylur/ags";
gruvbox-kvantum = {
url = "github:thefallnn/Gruvbox-Kvantum";
flake = false;
};
gruvbox-kvantum.url = "github:thefallnn/Gruvbox-Kvantum";
gruvbox-kvantum.flake = false;
fish-plugin-bobthefish = {
url = "github:oh-my-fish/theme-bobthefish";
flake = false;
};
fish-plugin-bobthefish.url = "github:oh-my-fish/theme-bobthefish";
fish-plugin-bobthefish.flake = false;
fish-plugin-gruvbox-theme = {
url = "github:Jomik/fish-gruvbox";
flake = false;
};
fish-plugin-gruvbox-theme.url = "github:Jomik/fish-gruvbox";
fish-plugin-gruvbox-theme.flake = false;
nvim-hmts = {
url = "github:calops/hmts.nvim";
flake = false;
};
gruvbox-plus-icon-pack = {
url = "github:SylEleuth/gruvbox-plus-icon-pack";
flake = false;
};
openmw-git = {
url = "gitlab:OpenMW/openmw";
flake = false;
};
mygui-git = {
url = "github:mygui/MyGUI/dae9ac4be5a09e672bec509b1a8552b107c40214";
flake = false;
};
gruvbox-plus-icon-pack.url = "github:SylEleuth/gruvbox-plus-icon-pack";
gruvbox-plus-icon-pack.flake = false;
};
outputs = {

22
overlay.nix
View File

@ -10,22 +10,6 @@
fonts = ["JetBrainsMono"];
};
# mygui = prev.mygui.overrideAttrs (old: {
# version = "3.4.3";
# src = inputs.mygui-git;
# patches = [];
# });
#
# openmw = prev.openmw.overrideAttrs (old: {
# version = "9999";
# src = inputs.openmw-git;
#
# buildInputs = old.buildInputs ++ [prev.libyamlcpp prev.luajit prev.collada-dom];
#
# patches = [];
# dontWrapQtApps = false;
# });
kitty = prev.kitty.overrideAttrs (old: {
patches = [./pkgs/kitty/0011-fix-test_fish_integration.patch];
});
@ -42,11 +26,5 @@
prev.mpg123
];
};
nvim-hmts = prev.vimUtils.buildVimPlugin {
pname = "nvim-hmts";
version = "1";
src = inputs.nvim-hmts;
};
};
}

26
user/configs/neovim/config/lua/plugins/cmp.lua
View File

@ -11,7 +11,6 @@ local has_words_before = function()
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end
cmp.setup({
preselect = cmp.PreselectMode.None,
formatting = {
@ -43,14 +42,14 @@ cmp.setup({
Struct = "",
Event = "",
Operator = "󰆕",
TypeParameter = ""
TypeParameter = "",
},
}),
},
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
require("luasnip").lsp_expand(args.body)
end,
},
@ -67,11 +66,11 @@ cmp.setup({
}),
mapping = cmp.mapping.preset.insert({
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = false }),
["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(),
["<CR>"] = cmp.mapping.confirm({ select = false }),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
@ -99,23 +98,20 @@ cmp.setup({
}),
})
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
cmp.event:on(
'confirm_done',
cmp_autopairs.on_confirm_done()
)
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
cmp.setup.cmdline(":", {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = "path" },
{ name = "cmdline" },
})
}),
})
cmp.setup.cmdline("/", {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = "buffer" },
})
}),
})

4
user/configs/neovim/config/lua/plugins/colorscheme.lua
View File

@ -1,6 +1,4 @@
require("gruvbox").setup({
transparent_mode = true
transparent_mode = true,
})
vim.cmd("colorscheme gruvbox")

5
user/configs/neovim/config/lua/plugins/ibl.lua
View File

@ -1,5 +1,4 @@
vim.opt.list = true
vim.opt.listchars:append "eol:↴"
vim.opt.listchars:append("eol:↴")
require("ibl").setup {
}
require("ibl").setup({})

29
user/configs/neovim/config/lua/plugins/lspconfig.lua
View File

@ -1,4 +1,4 @@
local capabilities = require('cmp_nvim_lsp').default_capabilities()
local capabilities = require("cmp_nvim_lsp").default_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
@ -10,7 +10,6 @@ local lspconfig = require("lspconfig")
local null_ls = require("null-ls")
local null_ls_formatting = null_ls.builtins.formatting
null_ls.setup({
sources = {
null_ls_formatting.prettier,
@ -18,9 +17,9 @@ null_ls.setup({
},
})
lspconfig.nixd.setup { capabilities = capabilities }
lspconfig.nixd.setup({ capabilities = capabilities })
lspconfig.lua_ls.setup {
lspconfig.lua_ls.setup({
capabilities = capabilities,
settings = {
Lua = {
@ -28,24 +27,24 @@ lspconfig.lua_ls.setup {
diagnostics = { globals = { "vim" } },
workspace = {
library = vim.api.nvim_get_runtime_file("", true),
checkThirdParty = false
checkThirdParty = false,
},
telemetry = { enable = false },
},
},
}
})
lspconfig.clangd.setup { capabilities = capabilities }
lspconfig.rust_analyzer.setup { capabilities = capabilities }
lspconfig.zls.setup { capabilities = capabilities }
lspconfig.jedi_language_server.setup { capabilities = capabilities }
lspconfig.bashls.setup { capabilities = capabilities }
lspconfig.tsserver.setup { capabilities = capabilities }
lspconfig.clangd.setup({ capabilities = capabilities })
lspconfig.rust_analyzer.setup({ capabilities = capabilities })
lspconfig.zls.setup({ capabilities = capabilities })
lspconfig.jedi_language_server.setup({ capabilities = capabilities })
lspconfig.bashls.setup({ capabilities = capabilities })
lspconfig.tsserver.setup({ capabilities = capabilities })
lspconfig.cssls.setup {
lspconfig.cssls.setup({
capabilities = capabilities,
cmd = { "css-languageserver", "--stdio" },
settings = {
css = { validate = false },
}
}
},
})

2
user/configs/neovim/config/lua/plugins/lualine.lua
View File

@ -1,5 +1,5 @@
require("lualine").setup({
options = {
theme = "gruvbox_dark",
}
},
})

5
user/configs/neovim/config/lua/plugins/neo-tree.lua
View File

@ -29,8 +29,7 @@ require("neo-tree").setup({
Struct = { icon = "󰌗", hl = "Type" },
Operator = { icon = "󰆕", hl = "Operator" },
TypeParameter = { icon = "󰊄", hl = "Type" },
StaticMethod = { icon = '󰠄 ', hl = 'Function' },
}
StaticMethod = { icon = "󰠄 ", hl = "Function" },
},
},
})

2
user/configs/neovim/config/lua/plugins/notify.lua
View File

@ -1,3 +1,3 @@
require("notify").setup({
background_colour = "#282828"
background_colour = "#282828",
})

2
user/configs/neovim/config/lua/plugins/smartsplits.lua
View File

@ -4,5 +4,5 @@ require("smart-splits").setup({
"nofile",
"quickfix",
"prompt",
}
},
})

2
user/configs/neovim/config/lua/plugins/surround.lua
View File

@ -1 +1 @@
require('nvim-surround').setup()
require("nvim-surround").setup()

3
user/configs/neovim/config/lua/plugins/telescope.lua
View File

@ -2,7 +2,7 @@ local telescope = require("telescope")
telescope.setup({
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown {}
require("telescope.themes").get_dropdown({}),
},
},
})
@ -10,4 +10,3 @@ telescope.setup({
telescope.load_extension("fzf")
telescope.load_extension("ui-select")
telescope.load_extension("undo")

4
user/configs/neovim/config/lua/plugins/treesitter.lua
View File

@ -1,4 +1,4 @@
require("nvim-treesitter.configs").setup {
require("nvim-treesitter.configs").setup({
highlight = { enable = true },
indent = { enable = true },
}
})

2
user/configs/neovim/config/lua/plugins/which-key.lua
View File

@ -2,6 +2,6 @@ vim.o.timeoutlen = 100
require("which-key").setup({
window = {
padding = { 1, 5, 1, 5}
padding = { 1, 5, 1, 5 },
},
})

26
user/configs/neovim/config/lua/remaps.lua
View File

@ -16,22 +16,22 @@ map( "n", "<C-n>", "<cmd>Neotree toggle<CR>", { desc = "Open NeoTree" }
map({ "n", "x" }, "ga", ":EasyAlign", { desc = "Align text" })
-- resizing splits
map('n', '<A-h>', smart_splits.resize_left)
map('n', '<A-j>', smart_splits.resize_down)
map('n', '<A-k>', smart_splits.resize_up)
map('n', '<A-l>', smart_splits.resize_right)
map("n", "<A-h>", smart_splits.resize_left)
map("n", "<A-j>", smart_splits.resize_down)
map("n", "<A-k>", smart_splits.resize_up)
map("n", "<A-l>", smart_splits.resize_right)
-- moving between splits
map('n', '<C-h>', smart_splits.move_cursor_left)
map('n', '<C-j>', smart_splits.move_cursor_down)
map('n', '<C-k>', smart_splits.move_cursor_up)
map('n', '<C-l>', smart_splits.move_cursor_right)
map("n", "<C-h>", smart_splits.move_cursor_left)
map("n", "<C-j>", smart_splits.move_cursor_down)
map("n", "<C-k>", smart_splits.move_cursor_up)
map("n", "<C-l>", smart_splits.move_cursor_right)
-- swapping buffers between windows
map('n', '<leader><leader>h', smart_splits.swap_buf_left)
map('n', '<leader><leader>j', smart_splits.swap_buf_down)
map('n', '<leader><leader>k', smart_splits.swap_buf_up)
map('n', '<leader><leader>l', smart_splits.swap_buf_right)
map("n", "<leader><leader>h", smart_splits.swap_buf_left)
map("n", "<leader><leader>j", smart_splits.swap_buf_down)
map("n", "<leader><leader>k", smart_splits.swap_buf_up)
map("n", "<leader><leader>l", smart_splits.swap_buf_right)
-- null-ls
map( 'n', "<Leader>lf", vim.lsp.buf.format, { desc = "Format file"})
map("n", "<Leader>lf", vim.lsp.buf.format, { desc = "Format file" })

8
user/configs/neovim/config/lua/settings.lua
View File

@ -24,3 +24,11 @@ vim.o.scrolloff = 8
vim.wo.number = true
vim.wo.relativenumber = true
vim.api.nvim_create_autocmd("FileType", {
pattern = "nix",
callback = function()
vim.opt_local.shiftwidth = 2
vim.opt_local.tabstop = 2
end,
})

17
user/configs/neovim/default.nix
View File

@ -4,24 +4,25 @@
plugins = with pkgs.vimPlugins; [
bufferline-nvim
gruvbox-nvim
comment-nvim
dressing-nvim
gruvbox-nvim
hmts-nvim
indent-blankline-nvim
lualine-nvim
luasnip
mini-nvim
neo-tree-nvim
noice-nvim
nui-nvim
nvim-autopairs
nvim-colorizer-lua
nvim-notify
nvim-surround
nvim-web-devicons
which-key-nvim
smart-splits-nvim
vim-easy-align
mini-nvim
nui-nvim
noice-nvim
which-key-nvim
vim-fugitive
@ -46,8 +47,7 @@
lspkind-nvim
];
extraPackages = with pkgs;
[
extraPackages = with pkgs; [
nodePackages.bash-language-server
clang-tools
lua-language-server
@ -59,9 +59,6 @@
nodePackages.typescript-language-server
nodePackages.vscode-css-languageserver-bin
zls
]
++ [
pkgs.nvim-hmts
];
};