chore(morty): install zellij

flake.lock

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735053786,
+        "lastModified": 1738667255,
-        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+        "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+        "rev": "7abcf59a365430b36f84eaa452a466b11e469e33",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734649271,
+        "lastModified": 1738546358,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1734649271,
+        "lastModified": 1738546358,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735317558,
+        "lastModified": 1738701110,
-        "narHash": "sha256-L9XE69JY8kiJnh0ix6P/JpK2Jc2lI8ZMqtWkg/o4RRM=",
+        "narHash": "sha256-w/ip8o2X2DCkSEge8cAfCFgiL4tvQU38GcqaL7IYmwk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "6e183e5c3a9d695d63b7eeb69605f6bc3f5d44df",
+        "rev": "8063859e3fb5f86039fd08240a585b9b4826da9c",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734546875,
+        "lastModified": 1738291974,
-        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
         "type": "github"
       },
       "original": {

hosts/luci/hardware-configuration.nix

@@ -59,6 +59,6 @@
       libvdpau-va-gl
     ];
   };
-
+  virtualisation.docker.enable = true;
-  users.extraGroups.vboxusers.members = [ "ephase" ];
+  users.extraGroups.docker.members = [ "ephase" ];
 }

hosts/morty/home-config.nix

@@ -15,6 +15,7 @@
       starship.enable = true;
       utils.enable = true;
       vifm.enable = true;
+      zellij.enable = true;
       zsh.enable = true;
     };
     video = {

hosts/rick/includes/home-manager.nix

@@ -1,5 +1,5 @@
 _:
-{ 
+{
   programs.zsh.loginExtra = ''
     #notmutch
     export NOTMUCH_CONFIG="$HOME/.config/notmuch/config"
@@ -14,6 +14,7 @@ _:
         export NO_AT_BRIDGE=1
         export XDG_SESSION_TYPE=wayland
         export XDG_CURRENT_DESKTOP=sway
+        export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
         exec ~/.local/bin/sway.sh
     fi
     '';

modules/home-manager/cli/git/default.nix

@@ -35,16 +35,22 @@ in
       userName = "${cfg.userName}";
       userEmail = "${cfg.userEmail}";
       aliases = {
+        co = "checkout";
         fa = "fetch --all";
         far = "!git fa; git rebase";
-        l = "log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+        l = "log --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(dim white)<%an>%Creset'";
-        lg = "log --graph --decorate --pretty=oneline --abbrev-commit";
+        la = "l --all";
+        lg = "log --graph --abbrev-commit --decorate --format=format:'%C(red)%h%C(reset) ┬ %C(cyan)%aD%C(reset) %C(green)(%ar)%C(reset)%C(yellow)%d%C(reset) %C(dim white) <%an>%C(reset)%n''         └─ %C(white)%s%C(reset)'";
+        lga = "lg --all";
         pf = "push --force-with-lease";
         rewrite = "!git commit --amend --no-edit && git push --force-with-lease";
         st = "status -sb";
       };
       extraConfig = {
-         push = {
+        core = {
+          abbrev = 8;
+        };
+        push = {
           autoSetupRemote = true;
           default = "current";
         };

modules/home-manager/cli/neovim/default.nix

@@ -10,16 +10,15 @@ let
     url = "https://ftp.nluug.nl/vim/runtime/spell/fr.utf-8.sug";
     sha256 = "0294bc32b42c90bbb286a89e23ca3773b7ef50eff1ab523b1513d6a25c6b3f58";
   };
-  fromGitHub = rev: ref: repo:
+  yaml-companion = pkgs.vimUtils.buildVimPlugin {
-    pkgs.vimUtils.buildVimPlugin {
+    pname = "yaml-companion";
-      pname = "${pkgs.lib.strings.sanitizeDerivationName repo}";
+    version = "main";
-      version = ref;
+    src = builtins.fetchGit {
-      src = builtins.fetchGit {
+      url = "https://github.com/someone-stole-my-name/yaml-companion.nvim.git";
-        url = "https://github.com/${repo}.git";
+      rev = "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0";
-        ref = ref;
+      ref = "main";
-        rev = rev;
-      };
     };
+  };
 in
 {
   options.modules.cli.neovim = {
@@ -197,13 +196,12 @@ in
           type = "lua";
           config = ( builtins.readFile ./files/whichkey.lua );
         }
-#       yaml companion
         {
-          plugin = ( fromGitHub
+          plugin = yaml-companion.overrideAttrs {
-            "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0"
+            dependencies = [
-            "main"
+              nvim-lspconfig
-            "someone-stole-my-name/yaml-companion.nvim"
+            ];
-          );
+          };
           type = "lua";
         }
         vim-helm

modules/home-manager/cli/neovim/files/lualine.lua

@@ -7,6 +7,12 @@ require('lualine').setup {
         disabled_filetypes = {},
         always_divide_middle = true,
         globalstatus = true,
+        -- reduce performance impact reducing refresh pace
+        refresh = {
+          statusline = 1500,
+          tabline = 1500,
+          winbar = 1500,
+        }
     },
     sections = {
         lualine_a = {'mode'},

modules/home-manager/cli/neovim/files/options.lua

@@ -1,4 +1,5 @@
 -- General Option
+vim.opt.syntax = "off";
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
@@ -9,7 +10,17 @@ vim.opt.clipboard = 'unnamedplus'      --Use system clipboard
 vim.opt.colorcolumn = '80'
 vim.opt.directory = os.getenv("HOME") .. '/.local/tmp/nvim'
 vim.opt.expandtab = true
-vim.opt.foldmethod = 'syntax'
+
+-- Foldling code
+-- Based on threesitter
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+vim.opt.foldcolumn = "0"
+vim.opt.foldtext = ""
+vim.opt.foldlevel = 99                -- I don't wand code to be fold by default
+vim.opt.foldlevelstart = 1
+vim.opt.foldnestmax = 2               -- max nested fold, 2 seems to be quite sufficient
+
 vim.opt.gdefault = true 	            -- search: all occurrences by default
 vim.opt.hlsearch = true 	            -- search: hightlight terms
 vim.opt.ignorecase = true
@@ -102,3 +113,11 @@ vim.api.nvim_set_keymap('n', '<leader>/', ':nohlsearch<CR>', opts)
 vim.api.nvim_set_keymap('n', '<Leader>]', ':tabnext<CR>', opts)
 vim.api.nvim_set_keymap('n', '<Leader>[', ':tabprev<CR>', opts)
 vim.api.nvim_set_keymap('n', '<leader>l', ':set list!<CR>', {silent = true})
+
+-- disable lsplog
+-- This is not usefull on a daily basis and should positively impact performance
+vim.lsp.set_log_level("off")
+
+-- define a timeout for match parens
+vim.g.matchparen_timeout = 2
+vim.g.matchparen_insert_timeout = 2

modules/home-manager/web/firefox/conf/preferences.nix

@@ -36,11 +36,14 @@
  "extensions.htmlaboutaddons.recommendations.enabled" = false;
  "extensions.recommendations.themeRecommendationUrl" = "";
 
-# Do not senf FF buid ID for ste statup page
+# Do not send FF build ID for site in startup page
  "browser.startup.homepage_override.mstone" = "ignore";
 
  "browser.aboutHomeSnippets.updateUrl" = "";
 
 # Restore session when restart
  "browser.sessionstore.resume_session_once" = true;
+
+# Disable translation
+ "browser.translations.enabled " = false;
 }