merge main
This commit is contained in:
parent
ae2cf393b2
commit
f02500fcfb
|
@ -107,7 +107,7 @@
|
|||
cube = {
|
||||
modules = [ basant.nixosModule ];
|
||||
};
|
||||
box = { channelName = "nixos" };
|
||||
box = { channelName = "nixos"; };
|
||||
# hypercube = { };
|
||||
# work = { };
|
||||
};
|
||||
|
@ -118,7 +118,7 @@
|
|||
suites = with profiles; rec {
|
||||
base = [ core users.root users.anish ];
|
||||
sealight = [ base server ]; # matrix rsshub backup wireguard
|
||||
mossnet = [ base server taskd nextcloud networking wireguard-box shaarli wallabag headphones dns backup monitoring dev gonic cron nfs];
|
||||
mossnet = [ base server taskd nextcloud networking wireguard-box shaarli wallabag headphones dns backup monitoring dev gonic cron nfs ];
|
||||
cube = [ base site server ];
|
||||
graphical = [ base bluetooth music sync wireguard wifi desktop ];
|
||||
curve = [ graphical secrets ];
|
||||
|
|
|
@ -152,7 +152,7 @@ in
|
|||
jtl = "journalctl";
|
||||
|
||||
# quick ssh
|
||||
sm = "ssh mossnet.lan";
|
||||
sm = "ssh 10.0.69.4";
|
||||
ss = "ssh sealight.xyz";
|
||||
sc = "ssh lakhwara.com"; # cube
|
||||
};
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
networking.extraHosts = ''
|
||||
192.168.1.240 mossnet.lan
|
||||
192.168.1.240 links.mossnet.lan
|
||||
192.168.1.240 read.mossnet.lan
|
||||
192.168.1.240 stats.mossnet.lan
|
||||
10.0.69.4 mossnet.lan
|
||||
10.0.69.4 links.mossnet.lan
|
||||
10.0.69.4 read.mossnet.lan
|
||||
10.0.69.4 stats.mossnet.lan
|
||||
'';
|
||||
#10.0.69.4 mossnet.lan
|
||||
#10.0.69.4 links.mossnet.lan
|
||||
#10.0.69.4 read.mossnet.lan
|
||||
#10.0.69.4 stats.mossnet.lan
|
||||
#192.168.1.240 mossnet.lan
|
||||
#192.168.1.240 links.mossnet.lan
|
||||
#192.168.1.240 read.mossnet.lan
|
||||
#192.168.1.240 stats.mossnet.lan
|
||||
}
|
||||
|
|
|
@ -76,8 +76,9 @@ in
|
|||
set autoindent
|
||||
set undofile
|
||||
set signcolumn=auto:4
|
||||
set title
|
||||
|
||||
" set foldmethod=indent " fold based on indent
|
||||
" set foldmethod=indent " fold based on indent
|
||||
set number
|
||||
set nocompatible
|
||||
set relativenumber
|
||||
|
@ -88,6 +89,9 @@ in
|
|||
set list lcs=tab:\|\
|
||||
filetype plugin on
|
||||
|
||||
" include - in word to move across easier in lisp / clojure
|
||||
set iskeyword+=-
|
||||
|
||||
set termguicolors
|
||||
colorscheme ayu-mirage
|
||||
|
||||
|
@ -111,9 +115,9 @@ in
|
|||
set signcolumn=yes
|
||||
|
||||
" window
|
||||
nmap <leader>wh :topleft vnew<CR>
|
||||
nmap <leader>wh :topleft vnew<CR>
|
||||
nmap <leader>wl :botright vnew<CR>
|
||||
nmap <leader>wk :topleft new<CR>
|
||||
nmap <leader>wk :topleft new<CR>
|
||||
nmap <leader>wj :botright new<CR>
|
||||
|
||||
" tabs
|
||||
|
@ -337,24 +341,24 @@ in
|
|||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true
|
||||
}),
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
elseif has_words_before() then
|
||||
cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
fallback()
|
||||
end
|
||||
end, {"i", "s"}),
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
},
|
||||
|
@ -439,6 +443,13 @@ in
|
|||
local opts = { noremap = true, silent = true }
|
||||
map('n', '<C-i>', '<CMD>lua require("FTerm").toggle()<CR>', opts)
|
||||
map('t', '<A-i>', '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>', opts)
|
||||
|
||||
-- Custom functions
|
||||
-- updateDate = function()
|
||||
-- for line in file.lines()
|
||||
-- if line.is_empty()
|
||||
-- line = os.time(<format>)
|
||||
-- return
|
||||
EOF
|
||||
|
||||
'';
|
||||
|
@ -451,6 +462,7 @@ in
|
|||
rnix-lsp
|
||||
terraform-lsp
|
||||
clj-kondo
|
||||
gcc
|
||||
# installs different langauge servers for neovim-lsp
|
||||
# have a look on the link below to figure out the ones for your languages
|
||||
# https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md
|
||||
|
|
Loading…
Reference in a new issue