From 80c32eae8b9696981e7dcbad24bb562a300c5492 Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Mon, 18 Nov 2024 20:24:49 -0500 Subject: [PATCH] feat: update git and neovim --- flake.lock | 95 +++++++++++++++++++++++++++++--------------- modules/git.nix | 14 +++++++ modules/neovim.nix | 2 + yadunut-mbp/home.nix | 15 ++++++- 4 files changed, 91 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 0571e04..eb42fa4 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -215,11 +215,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1731887066, + "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -249,6 +249,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -257,11 +285,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1731642829, + "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a", "type": "github" }, "original": { @@ -288,11 +316,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -317,11 +345,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729072117, - "narHash": "sha256-vAhQlGF9m3DY/9pgLQlBQnWz7YGuQ+FP3w5Ms5HSnZc=", + "lastModified": 1731883908, + "narHash": "sha256-Yt/eVhoj+SwpsQVK0YxM8jou55ni0+dqANuQ2IvIA28=", "owner": "nix-community", "repo": "nixvim", - "rev": "b9ea7f88b6117f076d3b122d9bec3f379c57a17a", + "rev": "5bc3fa6996ee37b754f2e815a165be6e4d0cfcb9", "type": "github" }, "original": { @@ -333,17 +361,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_2", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", + "lastModified": 1731582522, + "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=", "owner": "NuschtOS", "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", + "rev": "13300b2297c51368e0892c3ebe220f688014fe15", "type": "github" }, "original": { @@ -414,11 +443,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { diff --git a/modules/git.nix b/modules/git.nix index 8c948e7..8fd8b13 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -1,4 +1,6 @@ +{ pkgs, ... }: { + programs.git-credential-oauth.enable = true; programs.git = { enable = true; userEmail = "yadunand@yadunut.com"; @@ -19,6 +21,18 @@ commit.verbose = true; gpg.format = "ssh"; + credential = { + "https://git.yadunut.dev" = { + oauthClientId = "a4792ccc-144e-407e-86c9-5e7d8d9c3269"; + oauthScopes = "read:repository write:repository"; + oauthAuthURL = "/login/oauth/authorize"; + oauthTokenURL = "/login/oauth/access_token"; + }; + }; + }; }; + home.packages = [ + pkgs.delta + ]; } diff --git a/modules/neovim.nix b/modules/neovim.nix index dfb2734..edeb511 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -34,6 +34,8 @@ cssls.enable = true; jsonls.enable = true; html.enable = true; + denols.enable = true; + denols.autostart = false; }; keymaps.lspBuf = { gd = { action = "definition"; desc = "Goto Definition"; }; diff --git a/yadunut-mbp/home.nix b/yadunut-mbp/home.nix index 0952a9c..1ae215c 100644 --- a/yadunut-mbp/home.nix +++ b/yadunut-mbp/home.nix @@ -27,24 +27,27 @@ pkgs.go pkgs.beancount pkgs.coq - pkgs.delta # pkgs.dive pkgs.entr pkgs.fava + pkgs.typst pkgs.typst-lsp + pkgs.lazygit pkgs.jq pkgs.nixfmt-rfc-style pkgs.just pkgs.pyright - pkgs.yt-dlp pkgs.rsync pkgs.k9s pkgs.nil # nix lsp pkgs.vscode-langservers-extracted pkgs.zellij pkgs.gh + pkgs.deno + pkgs.poppler + pkgs.procps # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the @@ -58,6 +61,7 @@ # (pkgs.writeShellScriptBin "my-hello" '' # echo "Hello, ${config.home.username}!" # '') + ]; @@ -75,8 +79,15 @@ home.sessionVariables = { EDITOR = "nvim"; VISUAL = "nvim"; + JAVA_HOME="/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home"; + ANDROID_HOME="$HOME/Library/Android/sdk"; }; + home.sessionPath = [ + "$ANDROID_HOME/emulator" + "$ANDROID_HOME/platform-tools" + ]; + programs.zsh.shellAliases = { lg = "lazygit"; };