diff --git a/flake.nix b/flake.nix index 64b59fe8..dc409da6 100644 --- a/flake.nix +++ b/flake.nix @@ -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 ]; diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 4947e40e..b9adf21c 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -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 }; diff --git a/profiles/mossnet-hosts/default.nix b/profiles/mossnet-hosts/default.nix index b3f255de..bd3db15a 100644 --- a/profiles/mossnet-hosts/default.nix +++ b/profiles/mossnet-hosts/default.nix @@ -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 } diff --git a/users/profiles/nvim/default.nix b/users/profiles/nvim/default.nix index 2a91cc3b..eefbe670 100644 --- a/users/profiles/nvim/default.nix +++ b/users/profiles/nvim/default.nix @@ -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 wh :topleft vnew + nmap wh :topleft vnew nmap wl :botright vnew - nmap wk :topleft new + nmap wk :topleft new nmap wj :botright new " tabs @@ -337,24 +341,24 @@ in behavior = cmp.ConfirmBehavior.Insert, select = true }), - [""] = cmp.mapping(function(fallback) + [""] = 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"}), - [""] = cmp.mapping(function(fallback) + [""] = 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', '', 'lua require("FTerm").toggle()', opts) map('t', '', 'lua require("FTerm").toggle()', opts) + + -- Custom functions + -- updateDate = function() + -- for line in file.lines() + -- if line.is_empty() + -- line = os.time() + -- 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