changes
This commit is contained in:
FredzyW
commit
92691d7506
40 changed files with 2011 additions and 0 deletions
19
moduler/common/dmenu.nix
Normal file
19
moduler/common/dmenu.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
dmenu = pkgs.dmenu.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/FredzyW/dmenu.git";
|
||||
rev = "7ec109778998462a6762745c65c47a73283b810e";
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [
|
||||
xorg.libX11.dev
|
||||
xorg.libXft
|
||||
imlib2
|
||||
xorg.libXinerama
|
||||
];
|
||||
});
|
||||
in
|
||||
{
|
||||
home.packages = [ dmenu ];
|
||||
}
|
||||
|
||||
24
moduler/common/dunst/default.nix
Normal file
24
moduler/common/dunst/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ config
|
||||
, pkgs
|
||||
, ...
|
||||
}: {
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
width = 300;
|
||||
height = 300;
|
||||
offset = "30x50";
|
||||
origin = "top-right";
|
||||
transparency = 5;
|
||||
frame_color = "#eceff1";
|
||||
corner_radius = 10;
|
||||
};
|
||||
urgency_normal = {
|
||||
background = "#181818";
|
||||
foreground = "#dfdfdf";
|
||||
timeout = 10;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
26
moduler/common/dwm-2.nix
Normal file
26
moduler/common/dwm-2.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
dwm = pkgs.dwm.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/FredzyW/dwm-conf.git";
|
||||
rev = "99a1e812295bcf65625a4b5a0dc1022658977920";
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [
|
||||
xorg.libX11.dev
|
||||
xorg.libXft
|
||||
imlib2
|
||||
xorg.libXinerama
|
||||
];
|
||||
});
|
||||
dwmblocks = pkgs.dwmblocks.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/FredzyW/dwmblocks.git";
|
||||
rev = "a334789ec7b9171a3c8e1fcac2ffe8463ee438dc";
|
||||
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
home.packages = [ dwm dwmblocks ];
|
||||
}
|
||||
|
||||
36
moduler/common/dwm.nix
Normal file
36
moduler/common/dwm.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ pkgs, lib, myhostname, ... }:
|
||||
let
|
||||
dwm = pkgs.dwm.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
# url = "https://github.com/FredzyW/dwm-conf.git";
|
||||
# rev = "99a1e812295bcf65625a4b5a0dc1022658977920";
|
||||
url = "https://git.wastring.com/fw/dwm.git";
|
||||
rev = "04039f157960b83f1ab8abebb0ea77c72a75a249";
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [
|
||||
xorg.libX11.dev
|
||||
xorg.libXft
|
||||
imlib2
|
||||
xorg.libXinerama
|
||||
];
|
||||
});
|
||||
dwmblocks = if myhostname == "nix-desktop" then pkgs.dwmblocks.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
# url = "https://github.com/FredzyW/dwmblocks.git";
|
||||
# rev = "a334789ec7b9171a3c8e1fcac2ffe8463ee438dc";
|
||||
url = "https://git.wastring.com/fw/dwmblocks.git";
|
||||
rev = "ce19d482155f3292dc77179a2485670a48d2669c";
|
||||
};
|
||||
}) else pkgs.dwmblocks.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
# url = "https://github.com/FredzyW/dwmblocks.git";
|
||||
# rev = "7c81c55390f2deec2a3804217abe80221ef6f46a";
|
||||
url = "https://git.wastring.com/fw/dwmblocks.git";
|
||||
rev = "52198f692f5965b3e86577e8481e035d4c37ab52";
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
home.packages = [ dwm dwmblocks ];
|
||||
}
|
||||
|
||||
21
moduler/common/firefox.nix
Normal file
21
moduler/common/firefox.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
profiles.default = {
|
||||
isDefault = true;
|
||||
userChrome = ''
|
||||
@import "${
|
||||
builtins.fetchGit {
|
||||
url = "https://github.com/rockofox/firefox-minima";
|
||||
ref = "main";
|
||||
rev = "c5580fd04e9b198320f79d441c78a641517d7af5"; # <-- Change this
|
||||
}
|
||||
}/userChrome.css";
|
||||
'';
|
||||
settings = {
|
||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
8
moduler/common/git.nix
Normal file
8
moduler/common/git.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "FredzyW";
|
||||
userEmail = "fredrik@wastring.com";
|
||||
};
|
||||
}
|
||||
24
moduler/common/kitty.nix
Normal file
24
moduler/common/kitty.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ pkgs, lib, myhostname, ... }:
|
||||
{
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
font = if myhostname == "nix-desktop" then {
|
||||
name = "FiraCode Nerd Font";
|
||||
size = 18;
|
||||
} else {
|
||||
name = "FiraCode Nerd Font";
|
||||
size = 24;
|
||||
};
|
||||
shellIntegration = {
|
||||
enableZshIntegration = true;
|
||||
mode = "no-cursor";
|
||||
};
|
||||
theme = "Catppuccin-Macchiato";
|
||||
settings = {
|
||||
confirm_os_window_close = 2;
|
||||
cursor_shape = "block";
|
||||
cursor_blink_interval = 0;
|
||||
enable_audio_bell = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
29
moduler/common/lazygit.nix
Normal file
29
moduler/common/lazygit.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
gui = {
|
||||
theme = {
|
||||
activeBorderColor = [ "#a6da95" "bold" ];
|
||||
inactiveBorderColor = [ "#a5adcb" ];
|
||||
optionsTextColor = [ "#8aadf4" ];
|
||||
selectedLineBgColor = [ "#363a4f" ];
|
||||
cherryPickedCommitBgColor = [ "#494d64" ];
|
||||
cherryPickedCommitFgColor = [ "#a6da95" ];
|
||||
unstagedChangesColor = [ "#ed8796" ];
|
||||
defaultFgColor = [ "#cad3f5" ];
|
||||
searchingActiveBorderColor = [ "#eed49f" ];
|
||||
};
|
||||
|
||||
authorColors = {
|
||||
"*" = "#b7bdf8";
|
||||
};
|
||||
showRandomTip = false;
|
||||
showBottomLine = false;
|
||||
sidePanelWidth = 0.5;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
86
moduler/common/neovim/config/mappings.lua
Normal file
86
moduler/common/neovim/config/mappings.lua
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
vim.keymap.set('n', 'z', '<Plug>(leap)')
|
||||
vim.keymap.set('n', 'Z', '<Plug>(leap-from-window)')
|
||||
vim.keymap.set({ 'x', 'o' }, 'z', '<Plug>(leap-forward)')
|
||||
vim.keymap.set({ 'x', 'o' }, 'Z', '<Plug>(leap-backward)')
|
||||
|
||||
-- Harpoon
|
||||
vim.keymap.set('n', '<Space>ha', ':lua require("harpoon.mark").add_file()<CR>')
|
||||
vim.keymap.set('n', '<Space>hf', ':Telescope harpoon marks<CR>')
|
||||
vim.keymap.set('n', '<Space>he', ':lua require("harpoon.ui").toggle_quick_menu()<CR>')
|
||||
vim.keymap.set('n', '<Space>hn', ':lua require("harpoon.ui").nav_next()<CR>')
|
||||
vim.keymap.set('n', '<Space>hb', ':lua require("harpoon.ui").nav_prev()<CR>')
|
||||
|
||||
vim.cmd('highlight! HarpoonInactive guibg=NONE guifg=#63698c')
|
||||
vim.cmd('highlight! HarpoonActive guibg=NONE guifg=white')
|
||||
vim.cmd('highlight! HarpoonNumberActive guibg=NONE guifg=#7aa2f7')
|
||||
vim.cmd('highlight! HarpoonNumberInactive guibg=NONE guifg=#7aa2f7')
|
||||
vim.cmd('highlight! TabLineFill guibg=NONE guifg=white')
|
||||
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
-- Substitute
|
||||
vim.keymap.set("n", "s", require('substitute').operator, { noremap = true })
|
||||
vim.keymap.set("n", "ss", require('substitute').line, { noremap = true })
|
||||
vim.keymap.set("n", "S", require('substitute').eol, { noremap = true })
|
||||
vim.keymap.set("x", "s", require('substitute').visual, { noremap = true })
|
||||
|
||||
-- Move commands
|
||||
vim.keymap.set('n', '<Super-j>', ':MoveLine(1)<CR>', opts)
|
||||
vim.keymap.set('n', '<Super-k>', ':MoveLine(-1)<CR>', opts)
|
||||
vim.keymap.set('v', '<Super-j>', ':MoveBlock(1)<CR>', opts)
|
||||
vim.keymap.set('v', '<Super-k>', ':MoveBlock(-1)<CR>', opts)
|
||||
|
||||
-- Good navigation mappings for wrap
|
||||
vim.api.nvim_set_keymap('n', 'j', 'gj', { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap('n', 'k', 'gk', { noremap = true, silent = true })
|
||||
|
||||
-- Buffer navigation
|
||||
vim.api.nvim_set_keymap('n', '<Tab>', ':bnext<CR>', { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<S-Tab>', ':bprevious<CR>', { noremap = true, silent = true })
|
||||
|
||||
-- Window navigation
|
||||
vim.api.nvim_set_keymap('n', '<C-k>', ':wincmd k<CR>', { silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-j>', ':wincmd j<CR>', { silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-h>', ':wincmd h<CR>', { silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-l>', ':wincmd l<CR>', { silent = true })
|
||||
|
||||
vim.api.nvim_set_keymap('n', '<Space>c', ':bd<CR>', { silent = true })
|
||||
|
||||
-- Sniprun
|
||||
vim.api.nvim_set_keymap('v', 'f', '<Plug>SnipRun', { silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<leader>f', '<Plug>SnipRunOperator', { silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<leader>ff', '<Plug>SnipRun', { silent = true })
|
||||
|
||||
-- Highlight yanked
|
||||
vim.api.nvim_create_autocmd('TextYankPost', {
|
||||
group = vim.api.nvim_create_augroup('highlight_yank', {}),
|
||||
desc = 'Hightlight selection on yank',
|
||||
pattern = '*',
|
||||
callback = function()
|
||||
vim.highlight.on_yank { higroup = 'IncSearch', timeout = 200 }
|
||||
end,
|
||||
})
|
||||
|
||||
-- Telescope bindings
|
||||
vim.keymap.set('n', '<Space>ff', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<Space>fg', builtin.live_grep, {})
|
||||
vim.keymap.set('n', '<Space>fb', builtin.buffers, {})
|
||||
vim.keymap.set('n', '<Space>fh', builtin.help_tags, {})
|
||||
|
||||
|
||||
-- Bindings for save and quit
|
||||
vim.api.nvim_set_keymap('n', '<Space>w', ':w<CR>', { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<Space>q', ':q<CR>', {})
|
||||
|
||||
-- Neotree bindings
|
||||
vim.api.nvim_set_keymap('n', '<Space>e', ':RnvimrToggle<CR>', { noremap = true, silent = true })
|
||||
vim.api.nvim_set_var('rnvimr_enable_ex', 1)
|
||||
vim.api.nvim_set_var('rnvimr_enable_picker', 1)
|
||||
vim.api.nvim_set_var('rnvimr_edit_cmd', 'drop')
|
||||
vim.api.nvim_set_var('rnvimr_draw_border', 0)
|
||||
vim.api.nvim_set_var('rnvimr_hide_gitignore', 1)
|
||||
vim.api.nvim_set_var('rnvimr_border_attr', {fg = 14, bg = -1})
|
||||
vim.api.nvim_set_var('rnvimr_enable_bw', 1)
|
||||
vim.api.nvim_set_var('rnvimr_shadow_winblend', 70)
|
||||
vim.api.nvim_set_var('rnvimr_ranger_cmd', {'ranger', '--cmd=set draw_borders both'})
|
||||
|
||||
10
moduler/common/neovim/config/options.lua
Normal file
10
moduler/common/neovim/config/options.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
vim.opt.wrap = true
|
||||
vim.opt.shiftwidth = 4
|
||||
vim.opt.tabstop = 4
|
||||
vim.o.termguicolors = true
|
||||
vim.wo.relativenumber = true
|
||||
vim.wo.number = true
|
||||
vim.g.mapleader = ' '
|
||||
|
||||
vim.opt.termguicolors = true
|
||||
|
||||
167
moduler/common/neovim/config/plugins.lua
Normal file
167
moduler/common/neovim/config/plugins.lua
Normal file
|
|
@ -0,0 +1,167 @@
|
|||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable", -- latest stable release
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
|
||||
require("lazy").setup({
|
||||
{
|
||||
'm4xshen/autoclose.nvim',
|
||||
},
|
||||
{
|
||||
"BurntSushi/ripgrep",
|
||||
},
|
||||
{
|
||||
'kevinhwang91/rnvimr',
|
||||
},
|
||||
{
|
||||
'ThePrimeagen/harpoon',
|
||||
},
|
||||
{
|
||||
'ggandor/leap.nvim',
|
||||
},
|
||||
{
|
||||
'gfanto/fzf-lsp.nvim',
|
||||
},
|
||||
{
|
||||
'junegunn/fzf.vim',
|
||||
},
|
||||
{
|
||||
"junegunn/fzf",
|
||||
name = "fzf",
|
||||
dir = "~/.fzf",
|
||||
build = "./install --all"
|
||||
},
|
||||
{
|
||||
'RRethy/base16-nvim',
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
},
|
||||
{
|
||||
"folke/neodev.nvim",
|
||||
},
|
||||
{
|
||||
"mfussenegger/nvim-dap",
|
||||
},
|
||||
{
|
||||
'neovim/nvim-lspconfig'
|
||||
},
|
||||
{
|
||||
'hrsh7th/cmp-nvim-lsp'
|
||||
},
|
||||
{
|
||||
'hrsh7th/nvim-cmp'
|
||||
},
|
||||
{
|
||||
'nvim-focus/focus.nvim',
|
||||
version = false
|
||||
},
|
||||
{
|
||||
"folke/neoconf.nvim",
|
||||
cmd = "Neoconf"
|
||||
},
|
||||
{
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
main = "ibl",
|
||||
opts = {}
|
||||
},
|
||||
{
|
||||
'mrjones2014/legendary.nvim',
|
||||
-- since legendary.nvim handles all your keymaps/commands,
|
||||
-- its recommended to load legendary.nvim before other plugins
|
||||
priority = 10000,
|
||||
lazy = false,
|
||||
-- sqlite is only needed if you want to use frecency sorting
|
||||
-- dependencies = { 'kkharji/sqlite.lua' }
|
||||
},
|
||||
{
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
branch = 'v3.x'
|
||||
},
|
||||
{
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000
|
||||
},
|
||||
{
|
||||
'kevinhwang91/nvim-bqf'
|
||||
},
|
||||
{
|
||||
'akinsho/bufferline.nvim',
|
||||
version = "*",
|
||||
dependencies = 'nvim-tree/nvim-web-devicons'
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope-fzf-native.nvim',
|
||||
build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
|
||||
},
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
version = "v2.*",
|
||||
build = "make install_jsregexp"
|
||||
},
|
||||
{
|
||||
"gbprod/substitute.nvim",
|
||||
opts = {}
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate"
|
||||
},
|
||||
{
|
||||
"michaelb/sniprun",
|
||||
branch = "master",
|
||||
build = "sh install.sh",
|
||||
config = function()
|
||||
require("sniprun").setup({})
|
||||
end,
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
tag = '0.1.6',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim'
|
||||
}
|
||||
},
|
||||
{
|
||||
'mrcjkb/haskell-tools.nvim',
|
||||
version = '^3',
|
||||
ft = { 'haskell', 'lhaskell', 'cabal', 'cabalproject' },
|
||||
},
|
||||
{
|
||||
"kdheepak/lazygit.nvim",
|
||||
cmd = {
|
||||
"LazyGit",
|
||||
"LazyGitConfig",
|
||||
"LazyGitCurrentFile",
|
||||
"LazyGitFilter",
|
||||
"LazyGitFilterCurrentFile",
|
||||
},
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
|
||||
}
|
||||
},
|
||||
{
|
||||
'nvim-lualine/lualine.nvim',
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' }
|
||||
},
|
||||
{
|
||||
'numToStr/Comment.nvim',
|
||||
opts = {},
|
||||
lazy = false,
|
||||
},
|
||||
|
||||
})
|
||||
|
||||
230
moduler/common/neovim/config/setup.lua
Normal file
230
moduler/common/neovim/config/setup.lua
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
-- Define a function to generate keybinds for navigating to files
|
||||
local function setup_file_navigation_keybinds(start, stop)
|
||||
for i = start, stop do
|
||||
local keybind = string.format('<Space>h%d', i)
|
||||
local command = string.format(':lua require("harpoon.ui").nav_file(%d)<CR>', i)
|
||||
vim.keymap.set('n', keybind, command)
|
||||
end
|
||||
end
|
||||
|
||||
setup_file_navigation_keybinds(1, 9)
|
||||
|
||||
require'fzf_lsp'.setup()
|
||||
|
||||
require("autoclose").setup({
|
||||
keys = {
|
||||
["$"] = { escape = true, close = true, pair = "$$", disabled_filetypes = { "haskell" } },
|
||||
["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = { "markdown" } },
|
||||
["`"] = { escape = true, close = true, pair = "``", disabled_filetypes = { "markdown" } },
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
require('bqf').setup()
|
||||
require("ibl").setup()
|
||||
require("focus").setup()
|
||||
require("bufferline").setup()
|
||||
|
||||
local wk = require("which-key")
|
||||
wk.register(mappings, opts)
|
||||
|
||||
local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
|
||||
parser_config.csharp = {
|
||||
install_info = {
|
||||
url = "https://github.com/tree-sitter/tree-sitter-c-sharp", -- local path or git repo
|
||||
files = {"src/parser.c"}, -- note that some parsers also require src/scanner.c or src/scanner.cc
|
||||
branch = "master", -- default branch in case of git repo if different from master
|
||||
generate_requires_npm = false, -- if stand-alone parser without npm dependencies
|
||||
requires_generate_from_grammar = false, -- if folder contains pre-generated src/parser.c
|
||||
},
|
||||
filetype = "cs", -- if filetype does not match the parser name
|
||||
}
|
||||
|
||||
require'nvim-treesitter.configs'.setup {
|
||||
ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "haskell", "python", "bash", "clojure", "nix", "dockerfile", "latex", "csharp", "markdown" },
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
ignore_install = { "javascript" },
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
|
||||
disable = function(lang, buf)
|
||||
local max_filesize = 100 * 1024 -- 100 KB
|
||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
if ok and stats and stats.size > max_filesize then
|
||||
return true
|
||||
end
|
||||
end,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
|
||||
local function lsp()
|
||||
local clients = vim.lsp.buf_get_clients()
|
||||
if next(clients) == nil then
|
||||
return
|
||||
end
|
||||
|
||||
for _, client in pairs(clients) do
|
||||
return ("[" .. client.name .. "]")
|
||||
end
|
||||
end
|
||||
|
||||
require('lualine').setup {
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'base16',
|
||||
component_separators = { left = '|', right = '|' },
|
||||
section_separators = { left = '', right = '' },
|
||||
disabled_filetypes = {
|
||||
statusline = { 'neo-tree' },
|
||||
winbar = {},
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 1000,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { 'mode' },
|
||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
||||
lualine_c = { 'filename' },
|
||||
lualine_x = { lsp },
|
||||
lualine_y = { 'filetype' },
|
||||
lualine_z = {}
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b = {},
|
||||
lualine_c = { 'filename' },
|
||||
lualine_x = { 'location' },
|
||||
lualine_y = {},
|
||||
lualine_z = {}
|
||||
},
|
||||
tabline = {},
|
||||
winbar = {},
|
||||
inactive_winbar = {},
|
||||
extensions = {}
|
||||
}
|
||||
|
||||
require("telescope").load_extension('harpoon')
|
||||
|
||||
-- LSP Setup
|
||||
local lsp_zero = require('lsp-zero')
|
||||
|
||||
lsp_zero.on_attach(function(client, bufnr)
|
||||
lsp_zero.default_keymaps({ buffer = bufnr })
|
||||
end)
|
||||
require 'lspconfig'.hls.setup {}
|
||||
require 'lspconfig'.omnisharp.setup {
|
||||
cmd = { "/home/fw/.nix-profile/bin/dotnet", "/nix/store/jdp56g0j6mf7yjvqy9npw28y4pxcvgsw-omnisharp-roslyn-1.39.10/lib/omnisharp-roslyn/OmniSharp.dll" },
|
||||
}
|
||||
require 'lspconfig'.clojure_lsp.setup {}
|
||||
require 'lspconfig'.nil_ls.setup {}
|
||||
require 'lspconfig'.marksman.setup {}
|
||||
require 'lspconfig'.pylsp.setup {}
|
||||
require 'lspconfig'.bashls.setup {}
|
||||
require 'lspconfig'.dockerls.setup {}
|
||||
require 'lspconfig'.docker_compose_language_service.setup {}
|
||||
require 'lspconfig'.ansiblels.setup {}
|
||||
require 'lspconfig'.yamlls.setup {}
|
||||
require 'lspconfig'.lua_ls.setup {
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = { 'vim' }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
require("catppuccin").setup({
|
||||
flavour = "macchiato",
|
||||
background = {
|
||||
light = "latte",
|
||||
dark = "mocha",
|
||||
},
|
||||
transparent_background = false,
|
||||
show_end_of_buffer = false,
|
||||
term_colors = false,
|
||||
dim_inactive = {
|
||||
enabled = false,
|
||||
shade = "dark",
|
||||
percentage = 0.15,
|
||||
},
|
||||
no_italic = false,
|
||||
no_bold = false,
|
||||
no_underline = false,
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
conditionals = { "italic" },
|
||||
loops = {},
|
||||
functions = {},
|
||||
keywords = {},
|
||||
strings = {},
|
||||
variables = {},
|
||||
numbers = {},
|
||||
booleans = {},
|
||||
properties = {},
|
||||
types = {},
|
||||
operators = {},
|
||||
},
|
||||
color_overrides = {},
|
||||
custom_highlights = {},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
gitsigns = true,
|
||||
nvimtree = true,
|
||||
treesitter = true,
|
||||
notify = false,
|
||||
mini = {
|
||||
enabled = true,
|
||||
indentscope_color = "",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd('colorscheme base16-catppuccin-macchiato')
|
||||
|
||||
local cmp = require('cmp')
|
||||
|
||||
cmp.setup({
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
},
|
||||
mapping = {
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<Up>'] = cmp.mapping.select_prev_item({ behavior = 'select' }),
|
||||
['<Down>'] = cmp.mapping.select_next_item({ behavior = 'select' }),
|
||||
['<Tab>'] = cmp.mapping.select_next_item({ behavior = 'select' }),
|
||||
['<C-p>'] = cmp.mapping(function()
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item({ behavior = 'insert' })
|
||||
else
|
||||
cmp.complete()
|
||||
end
|
||||
end),
|
||||
['<C-n>'] = cmp.mapping(function()
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item({ behavior = 'insert' })
|
||||
else
|
||||
cmp.complete()
|
||||
end
|
||||
end),
|
||||
},
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
12
moduler/common/nixpkgs.nix
Normal file
12
moduler/common/nixpkgs.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
nixpkgs = {
|
||||
# Configure your nixpkgs instance
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"electron-25.9.0"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
52
moduler/common/nvim.nix
Normal file
52
moduler/common/nvim.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
];
|
||||
programs = {
|
||||
neovim = {
|
||||
plugins = [
|
||||
## Treesitter
|
||||
pkgs.vimPlugins.nvim-treesitter
|
||||
pkgs.vimPlugins.nvim-lspconfig
|
||||
|
||||
pkgs.vimPlugins.plenary-nvim
|
||||
pkgs.vimPlugins.telescope-nvim
|
||||
pkgs.vimPlugins.telescope-fzf-native-nvim
|
||||
|
||||
## cmp
|
||||
pkgs.vimPlugins.nvim-cmp
|
||||
pkgs.vimPlugins.cmp-nvim-lsp
|
||||
|
||||
pkgs.vimPlugins.luasnip
|
||||
pkgs.vimPlugins.cmp_luasnip
|
||||
pkgs.vimPlugins.vim-surround
|
||||
pkgs.vimPlugins.vim-obsession
|
||||
pkgs.vimPlugins.neoformat
|
||||
pkgs.vimPlugins.lazygit-nvim
|
||||
pkgs.vimPlugins.gitsigns-nvim
|
||||
pkgs.vimPlugins.lualine-nvim
|
||||
pkgs.vimPlugins.nvim-web-devicons
|
||||
pkgs.vimPlugins.leap-nvim
|
||||
pkgs.vimPlugins.vim-repeat
|
||||
|
||||
## Debugging
|
||||
pkgs.vimPlugins.nvim-dap
|
||||
pkgs.vimPlugins.nvim-dap-ui
|
||||
pkgs.vimPlugins.nvim-dap-virtual-text
|
||||
];
|
||||
|
||||
extraConfig = ''
|
||||
lua << EOF
|
||||
${builtins.readFile config/mappings.lua}
|
||||
${builtins.readFile config/options.lua}
|
||||
${builtins.readFile config/setup.lua}
|
||||
'';
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
10
moduler/common/spotifyd.nix
Normal file
10
moduler/common/spotifyd.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ pkgs, lib, myhostname, ... }:
|
||||
{
|
||||
services.spotifyd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
username = "fredzyw";
|
||||
device_name = myhostname;
|
||||
};
|
||||
};
|
||||
}
|
||||
20
moduler/common/ssh.nix
Normal file
20
moduler/common/ssh.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
"git.wastring.com" = {
|
||||
hostname = "git.wastring.com";
|
||||
port = 55503;
|
||||
user = "git";
|
||||
identityFile = "/home/fw/.ssh/gitea";
|
||||
};
|
||||
"wastring.com" = {
|
||||
hostname = "wastring.com";
|
||||
port = 55502;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/id_ed25519";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
47
moduler/common/tmux.nix
Normal file
47
moduler/common/tmux.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
mouse = true;
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.sensible
|
||||
tmuxPlugins.tmux-fzf
|
||||
tmuxPlugins.pain-control
|
||||
tmuxPlugins.sessionist
|
||||
# tmuxPlugins.catppuccin
|
||||
# tmuxPlugins.weather
|
||||
tmuxPlugins.resurrect
|
||||
tmuxPlugins.continuum
|
||||
];
|
||||
prefix = "C-a";
|
||||
terminal = "xterm-256color";
|
||||
keyMode = "vi";
|
||||
escapeTime = 0;
|
||||
extraConfig = "
|
||||
set -g @catppuccin_flavour 'macchiato'
|
||||
set -g @catppuccin_window_left_separator '█'
|
||||
set -g @catppuccin_window_right_separator '█ '
|
||||
set -g @catppuccin_window_number_position 'right'
|
||||
set -g @catppuccin_window_middle_separator ' █'
|
||||
|
||||
set -g @catppuccin_window_default_fill 'number'
|
||||
|
||||
set -g @catppuccin_window_current_fill 'number'
|
||||
set -g @catppuccin_window_current_text '#{pane_current_path}'
|
||||
|
||||
set -g @catppuccin_status_left_separator ''
|
||||
set -g @catppuccin_status_right_separator ' '
|
||||
set -g @catppuccin_status_fill 'all'
|
||||
set -g @catppuccin_status_connect_separator 'yes'
|
||||
run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux
|
||||
run-shell ${pkgs.tmuxPlugins.weather}/share/tmux-plugins/weather/weather.tmux
|
||||
set -g @catppuccin_status_modules_right 'date_time weather'
|
||||
set -g @catppuccin_window_number_position 'right'
|
||||
set -g @continuum-boot 'on'
|
||||
set -g @continuum-restore 'on'
|
||||
set -g @resurrect-strategy-nvim 'session'
|
||||
set -g @resurrect-capture-pane-contents 'on'
|
||||
set -g @resurrect-processes 'nvim'
|
||||
";
|
||||
};
|
||||
}
|
||||
9
moduler/common/zathura.nix
Normal file
9
moduler/common/zathura.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.zathura = {
|
||||
enable = true;
|
||||
options = {
|
||||
selection-clipboard = "clipboard";
|
||||
};
|
||||
};
|
||||
}
|
||||
66
moduler/common/zsh-server.nix
Normal file
66
moduler/common/zsh-server.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
export PATH=/home/fw/.local/bin:$PATH
|
||||
'';
|
||||
plugins = with pkgs; [
|
||||
{
|
||||
name = "zsh-z";
|
||||
file = "zsh-z.plugin.zsh";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/agkozak/zsh-z";
|
||||
rev = "afaf2965b41fdc6ca66066e09382726aa0b6aa04";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
}
|
||||
];
|
||||
shellAliases = {
|
||||
ls="ls --color=auto";
|
||||
ll="ls -al --color=auto";
|
||||
ccr="gcc intopt.c && ./a.out";
|
||||
homec="nvim ~/nix/config/home.nix";
|
||||
nvimc="nvim ~/.config/nvim/init.lua";
|
||||
sdg="sudo nix-collect-garbage -d";
|
||||
udg="nix-collect-garbage -d";
|
||||
df="df -h";
|
||||
c="clear";
|
||||
};
|
||||
enableCompletion = true;
|
||||
initExtraBeforeCompInit = ''
|
||||
# Lines configured by zsh-newuser-install
|
||||
home() {
|
||||
cd ~/nix/ && home-manager switch --flake ".#fw@$(hostname)";
|
||||
}
|
||||
update() {
|
||||
sudo nix-channel --update && sudo nixos-rebuild switch --upgrade --flake '.#$(hostname)'
|
||||
}
|
||||
reb() {
|
||||
cd ~/nix/ && sudo nixos-rebuild switch --flake ".#$(hostname)"
|
||||
}
|
||||
|
||||
HISTFILE=~/.histfile
|
||||
HISTSIZE=1000
|
||||
SAVEHIST=1000
|
||||
setopt autocd extendedglob
|
||||
bindkey -v
|
||||
bindkey '^R' history-incremental-search-backward
|
||||
bindkey '^[[1;5C' emacs-forward-word
|
||||
bindkey '^[[1;5D' emacs-backward-word
|
||||
# End of lines configured by zsh-newuser-install
|
||||
# The following lines were added by compinstall
|
||||
zstyle :compinstall filename '/home/fw/.zshrc'
|
||||
|
||||
# autoload -Uz compinit
|
||||
autoload -U compinit; compinit
|
||||
zstyle ':completion:*' menu select
|
||||
|
||||
'';
|
||||
};
|
||||
}
|
||||
71
moduler/common/zsh.nix
Normal file
71
moduler/common/zsh.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
export PATH=/home/fw/.local/bin:$PATH
|
||||
'';
|
||||
plugins = with pkgs; [
|
||||
{
|
||||
name = "zsh-z";
|
||||
file = "zsh-z.plugin.zsh";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/agkozak/zsh-z";
|
||||
rev = "afaf2965b41fdc6ca66066e09382726aa0b6aa04";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
}
|
||||
];
|
||||
profileExtra = "
|
||||
if [[ -z $DISPLAY ]]; then
|
||||
exec startx
|
||||
fi
|
||||
";
|
||||
shellAliases = {
|
||||
ls="ls --color=auto";
|
||||
ll="ls -al --color=auto";
|
||||
ccr="gcc intopt.c && ./a.out";
|
||||
homec="nvim ~/nix/config/home.nix";
|
||||
nvimc="nvim ~/.config/nvim/init.lua";
|
||||
sdg="sudo nix-collect-garbage -d";
|
||||
udg="nix-collect-garbage -d";
|
||||
df="df -h";
|
||||
c="clear";
|
||||
};
|
||||
enableCompletion = true;
|
||||
initExtraBeforeCompInit = ''
|
||||
# Lines configured by zsh-newuser-install
|
||||
home() {
|
||||
cd ~/nix/ && home-manager switch --flake ".#fw@$(hostname)";
|
||||
}
|
||||
update() {
|
||||
sudo nix-channel --update && sudo nixos-rebuild switch --upgrade --flake '.#$(hostname)'
|
||||
}
|
||||
reb() {
|
||||
cd ~/nix/ && sudo nixos-rebuild switch --flake ".#$(hostname)"
|
||||
}
|
||||
|
||||
HISTFILE=~/.histfile
|
||||
HISTSIZE=1000
|
||||
SAVEHIST=1000
|
||||
setopt autocd extendedglob
|
||||
bindkey -v
|
||||
bindkey '^R' history-incremental-search-backward
|
||||
bindkey '^[[1;5C' emacs-forward-word
|
||||
bindkey '^[[1;5D' emacs-backward-word
|
||||
# End of lines configured by zsh-newuser-install
|
||||
# The following lines were added by compinstall
|
||||
zstyle :compinstall filename '/home/fw/.zshrc'
|
||||
|
||||
# autoload -Uz compinit
|
||||
autoload -U compinit; compinit
|
||||
zstyle ':completion:*' menu select
|
||||
|
||||
'';
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue