diff --git a/flake.lock b/flake.lock index 74bf3c6..1355412 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736204492, - "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { diff --git a/git/default.nix b/git/default.nix index 4ed8da1..9491095 100644 --- a/git/default.nix +++ b/git/default.nix @@ -26,14 +26,35 @@ }; extraConfig = { - core.editor = "nvim"; - core.pager = "less -FX"; + branch.sort = "-committerdate"; - diff.ignoreSubmodules = "none"; + core = { + editor = "nvim"; + fsmonitor = true; + pager = "less -FX"; + untrackedCache = true; + }; - fetch.parallel = 8; - fetch.writeCommitGraph = true; - fetch.recurseSubmodules = true; + column.ui = "auto"; + + commit.verbose = true; + + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + ignoreSubmodules = "none"; + mnemonicPrefix = true; + renames = true; + }; + + fetch = { + all = true; + parallel = 8; + prune = true; + pruneTags = true; + recurseSubmodules = true; + writeCommitGraph = true; + }; format.pretty = "format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s"; @@ -41,8 +62,11 @@ log.date = "relative"; - merge.ff = false; - merge.tool = "nvim"; + merge = { + conflictstyle = "zdiff3"; + ff = false; + tool = "nvim"; + }; mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'"; mergetool.nvim.trustExitCode = false; @@ -52,17 +76,31 @@ pull.rebase = true; - push.recurseSubmodules = "on-demand"; + push = { + autoSetupRemote = true; + default = "simple"; + followTags = true; + recurseSubmodules = "on-demand"; + }; - rebase.autostash = true; + rebase = { + qutoSquash = true; + autoStash = true; + updateRefs = true; + }; - rerere.enabled = true; + rerere = { + autoupdate = true; + enabled = true; + }; status.submoduleSummary = true; submodule.fetchJobs = 8; submodule.recurse = true; + tag.sort = "version:refname"; + worktree.guessRemote = true; }; diff --git a/neovim/default.nix b/neovim/default.nix index 1b7f2a5..c06ccb7 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -122,6 +122,8 @@ nixd nixpkgs-fmt bitbake-language-server + pyright + (python3.withPackages (ps: with ps; [ pep8 autopep8 diff --git a/neovim/lspconfig.lua b/neovim/lspconfig.lua index ea85b43..51d1fe1 100644 --- a/neovim/lspconfig.lua +++ b/neovim/lspconfig.lua @@ -113,6 +113,7 @@ local servers = { } } }, + ["pyright"] = {}, ["texlab"] = {}, ["yamlls"] = { yaml = { diff --git a/shell/default.nix b/shell/default.nix index dcddb25..a6023b0 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ + devenv difftastic dust htop diff --git a/shell/shell_aliases.nix b/shell/shell_aliases.nix index 2b39161..c3141df 100644 --- a/shell/shell_aliases.nix +++ b/shell/shell_aliases.nix @@ -7,7 +7,6 @@ gs = "git status"; gd = "git diff"; gf = "git fetch"; - gfp = "git fetch --prune"; k = "kubectl"; ww = "nvim -c VimwikiIndex"; };