diff --git a/flake.lock b/flake.lock index 28109cc..a9b0eba 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1738667255, - "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7abcf59a365430b36f84eaa452a466b11e469e33", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738701110, - "narHash": "sha256-w/ip8o2X2DCkSEge8cAfCFgiL4tvQU38GcqaL7IYmwk=", + "lastModified": 1735317558, + "narHash": "sha256-L9XE69JY8kiJnh0ix6P/JpK2Jc2lI8ZMqtWkg/o4RRM=", "owner": "nix-community", "repo": "NUR", - "rev": "8063859e3fb5f86039fd08240a585b9b4826da9c", + "rev": "6e183e5c3a9d695d63b7eeb69605f6bc3f5d44df", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { diff --git a/hosts/luci/hardware-configuration.nix b/hosts/luci/hardware-configuration.nix index 3a5d77e..aba4695 100644 --- a/hosts/luci/hardware-configuration.nix +++ b/hosts/luci/hardware-configuration.nix @@ -59,6 +59,6 @@ libvdpau-va-gl ]; }; - virtualisation.docker.enable = true; - users.extraGroups.docker.members = [ "ephase" ]; + + users.extraGroups.vboxusers.members = [ "ephase" ]; } diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix index 1aeab52..c5bd59f 100644 --- a/hosts/morty/home-config.nix +++ b/hosts/morty/home-config.nix @@ -15,7 +15,6 @@ starship.enable = true; utils.enable = true; vifm.enable = true; - zellij.enable = true; zsh.enable = true; }; video = { diff --git a/hosts/rick/includes/home-manager.nix b/hosts/rick/includes/home-manager.nix index a98c311..0f67972 100644 --- a/hosts/rick/includes/home-manager.nix +++ b/hosts/rick/includes/home-manager.nix @@ -1,5 +1,5 @@ _: -{ +{ programs.zsh.loginExtra = '' #notmutch export NOTMUCH_CONFIG="$HOME/.config/notmuch/config" @@ -14,7 +14,6 @@ _: 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 ''; diff --git a/modules/home-manager/cli/git/default.nix b/modules/home-manager/cli/git/default.nix index 07ec476..bcf8c70 100644 --- a/modules/home-manager/cli/git/default.nix +++ b/modules/home-manager/cli/git/default.nix @@ -35,22 +35,16 @@ in userName = "${cfg.userName}"; userEmail = "${cfg.userEmail}"; aliases = { - co = "checkout"; fa = "fetch --all"; far = "!git fa; git rebase"; - l = "log --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(dim white)<%an>%Creset'"; - 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"; + l = "log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; + lg = "log --graph --decorate --pretty=oneline --abbrev-commit"; pf = "push --force-with-lease"; rewrite = "!git commit --amend --no-edit && git push --force-with-lease"; st = "status -sb"; }; extraConfig = { - core = { - abbrev = 8; - }; - push = { + push = { autoSetupRemote = true; default = "current"; }; diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix index 7cf7d45..2daee9a 100644 --- a/modules/home-manager/cli/neovim/default.nix +++ b/modules/home-manager/cli/neovim/default.nix @@ -10,15 +10,16 @@ let url = "https://ftp.nluug.nl/vim/runtime/spell/fr.utf-8.sug"; sha256 = "0294bc32b42c90bbb286a89e23ca3773b7ef50eff1ab523b1513d6a25c6b3f58"; }; - yaml-companion = pkgs.vimUtils.buildVimPlugin { - pname = "yaml-companion"; - version = "main"; - src = builtins.fetchGit { - url = "https://github.com/someone-stole-my-name/yaml-companion.nvim.git"; - rev = "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0"; - ref = "main"; + fromGitHub = rev: ref: repo: + pkgs.vimUtils.buildVimPlugin { + pname = "${pkgs.lib.strings.sanitizeDerivationName repo}"; + version = ref; + src = builtins.fetchGit { + url = "https://github.com/${repo}.git"; + ref = ref; + rev = rev; + }; }; - }; in { options.modules.cli.neovim = { @@ -196,12 +197,13 @@ in type = "lua"; config = ( builtins.readFile ./files/whichkey.lua ); } +# yaml companion { - plugin = yaml-companion.overrideAttrs { - dependencies = [ - nvim-lspconfig - ]; - }; + plugin = ( fromGitHub + "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0" + "main" + "someone-stole-my-name/yaml-companion.nvim" + ); type = "lua"; } vim-helm diff --git a/modules/home-manager/cli/neovim/files/lualine.lua b/modules/home-manager/cli/neovim/files/lualine.lua index fdf4119..0c5854b 100644 --- a/modules/home-manager/cli/neovim/files/lualine.lua +++ b/modules/home-manager/cli/neovim/files/lualine.lua @@ -7,12 +7,6 @@ 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'}, diff --git a/modules/home-manager/cli/neovim/files/options.lua b/modules/home-manager/cli/neovim/files/options.lua index a33b8c4..2dd3332 100644 --- a/modules/home-manager/cli/neovim/files/options.lua +++ b/modules/home-manager/cli/neovim/files/options.lua @@ -1,5 +1,4 @@ -- General Option -vim.opt.syntax = "off"; vim.g.mapleader = " " vim.g.maplocalleader = " " @@ -10,17 +9,7 @@ vim.opt.clipboard = 'unnamedplus' --Use system clipboard vim.opt.colorcolumn = '80' vim.opt.directory = os.getenv("HOME") .. '/.local/tmp/nvim' vim.opt.expandtab = true - --- 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.foldmethod = 'syntax' vim.opt.gdefault = true -- search: all occurrences by default vim.opt.hlsearch = true -- search: hightlight terms vim.opt.ignorecase = true @@ -113,11 +102,3 @@ vim.api.nvim_set_keymap('n', '/', ':nohlsearch', opts) vim.api.nvim_set_keymap('n', ']', ':tabnext', opts) vim.api.nvim_set_keymap('n', '[', ':tabprev', opts) vim.api.nvim_set_keymap('n', 'l', ':set list!', {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 diff --git a/modules/home-manager/web/firefox/conf/preferences.nix b/modules/home-manager/web/firefox/conf/preferences.nix index 1e4afa0..f7ad1a3 100644 --- a/modules/home-manager/web/firefox/conf/preferences.nix +++ b/modules/home-manager/web/firefox/conf/preferences.nix @@ -36,14 +36,11 @@ "extensions.htmlaboutaddons.recommendations.enabled" = false; "extensions.recommendations.themeRecommendationUrl" = ""; -# Do not send FF build ID for site in startup page +# Do not senf FF buid ID for ste statup 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; }