diff --git a/flake.lock b/flake.lock index 5ef23d9..f99bd80 100644 --- a/flake.lock +++ b/flake.lock @@ -459,11 +459,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684215771, - "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", + "lastModified": 1685168767, + "narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", + "rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262", "type": "github" }, "original": { @@ -740,11 +740,11 @@ "yants": "yants_2" }, "locked": { - "lastModified": 1684180498, - "narHash": "sha256-kA58ms4yunOVPhe3r7V0IIKeWUV+vl4r2GTcfFfYW5o=", + "lastModified": 1684882168, + "narHash": "sha256-Yu1yw1sPWZsXe7BX7HaHg+O8fWKHCpy/AwgGfBdhivw=", "owner": "divnix", "repo": "std", - "rev": "45b431ae09df98e046bcc8271aa209bdfc87444d", + "rev": "959f54d6698ff7fea01e4e6d8e5d7d95fcf66844", "type": "github" }, "original": { diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua index 9173409..7db0368 100644 --- a/native_configs/neovim/init.lua +++ b/native_configs/neovim/init.lua @@ -72,7 +72,7 @@ Plug('folke/trouble.nvim') -- File-grouped workspace diagnostics Plug('tpope/vim-dispatch') -- Allows quick build/compile/test vim commands Plug('clojure-vim/vim-jack-in') -- Clojure: ":Boot", ":Clj", ":Lein" Plug('radenling/vim-dispatch-neovim') -- Add support for neovim's terminal emulator -Plug('Olical/conjure') -- REPL on the source for Clojure (and other LISPs) +-- Plug('Olical/conjure') -- REPL on the source for Clojure (and other LISPs) Plug('gennaro-tedesco/nvim-jqx') -- JSON formatter (use :Jqx*) Plug('kylechui/nvim-surround') -- surrounds with tags/parenthesis Plug('simrat39/rust-tools.nvim') -- config rust-analyzer and nvim integration @@ -87,7 +87,6 @@ Plug('m-demare/hlargs.nvim') -- highlights arguments; great for f Plug('folke/todo-comments.nvim') -- Highlights TODO -- other utilities -Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) Plug('nvim-treesitter/nvim-treesitter-context') -- Top one-liner context of func/class scope Plug('nvim-treesitter/playground') -- Sees Treesitter AST - less hair pulling, more PRs Plug('saadparwaiz1/cmp_luasnip') -- snippet engine @@ -98,6 +97,7 @@ Plug('mickael-menu/zk-nvim') -- Zettelkasten -- `gsu` -> UPPER_CASE (CONSTs), `gsk` -> kebab-case (Clojure), `gsK` -> Title-Kebab-Case -- `gs.` -> dot.case (R) Plug('arthurxavierx/vim-caser') -- switch cases +Plug('pegasust/tsql.nvim') -- workspace code intelligence --------- vim.call('plug#end') @@ -775,7 +775,6 @@ require("rust-tools").setup { -- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error" on_initialized = function() require('inlay-hints').set_all() - end, -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. reload_workspace_from_cargo_toml = true, @@ -920,7 +919,7 @@ require("rust-tools").setup { nmap('K', require 'rust-tools'.hover_actions.hover_actions, 'Hover Documentation') end, capabilities = capabilities, - cmd = {"rust-analyzer"}, + cmd = { "rust-analyzer" }, settings = { ["rust-analyzer"] = { -- enable clippy on save diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index 6e58fe8..26e6774 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -803,11 +803,11 @@ ] }, "locked": { - "lastModified": 1684189380, - "narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=", + "lastModified": 1685189510, + "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6", + "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", "type": "github" }, "original": { @@ -938,11 +938,11 @@ "topiary": "topiary" }, "locked": { - "lastModified": 1684220170, - "narHash": "sha256-Vl6KHfZCmG016cN3xkaHgVtB9p2eODwjHQuMXF3KUsg=", + "lastModified": 1685111201, + "narHash": "sha256-WiaWxL1mBvHjOWGfC082zj/Nd1aaJt+Ga+KuzPQZ5dk=", "owner": "tweag", "repo": "nickel", - "rev": "f11b7b09e2fbbcaa6384e511ef95cde1f4aae93a", + "rev": "afdaff57cec860b27e9cdab79fafc2ee724b0cff", "type": "github" }, "original": { @@ -1182,11 +1182,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1684215771, - "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", + "lastModified": 1685168767, + "narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", + "rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262", "type": "github" }, "original": { @@ -1753,11 +1753,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1684203630, - "narHash": "sha256-ZOWNixdHU4qFZUgYNEULFB3ifctMQO9H4Oo+Zrz+4L8=", + "lastModified": 1685240871, + "narHash": "sha256-bOCbP0lWTjhmrPcdyuFD/yx/38CKkzC2TNXmBzZSLJA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "65c3f2655f52a81e1b3e629d4c07df4873d0f2bb", + "rev": "aa1b08de9ca770534ad750dccc70cebd95c15e26", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 121501b..47cc1aa 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -191,6 +191,7 @@ # FIXME: this actually does not exist base.keepass.path = "/Users/htran/keepass.kdbx"; base.alacritty.font.size = 11.0; + base.alacritty.font.family = "DroidSansM Nerd Font"; base.git.name = "Hung"; base.git.email = "htran@egihosting.com"; } @@ -199,7 +200,6 @@ pkgs.postman ]; } - nerd_font_module { base.keepass.enable = pkgs.lib.mkForce false; } ]; extraSpecialArgs = mkModuleArgs { diff --git a/nix-conf/home-manager/htran/nix.conf b/nix-conf/home-manager/htran/nix.conf new file mode 100644 index 0000000..93b8bba --- /dev/null +++ b/nix-conf/home-manager/htran/nix.conf @@ -0,0 +1,6 @@ +accept-flake-config = true +experimental-features = nix-command flakes +post-build-hook = /etc/nix/upload-to-cache.sh +trusted-users = root htran hungtran hwtr +max-jobs = 8 +cores = 12 diff --git a/nix-conf/home-manager/nix.conf b/nix-conf/home-manager/nix.conf new file mode 100644 index 0000000..a9ba586 --- /dev/null +++ b/nix-conf/home-manager/nix.conf @@ -0,0 +1,4 @@ +accept-flake-config = true +experimental-features = nix-command flakes +post-build-hook = /etc/nix/upload-to-cache.sh +trusted-users = root htran hungtran hwtr diff --git a/scripts/hm-switch.sh b/scripts/hm-switch.sh index fbf2782..04013b1 100755 --- a/scripts/hm-switch.sh +++ b/scripts/hm-switch.sh @@ -15,7 +15,8 @@ if [ -f /etc/nix/nix.conf ]; then echo "overwriting /etc/nix/nix.conf. Please find latest backup in ${BACKUP_FILE}" sudo cp /etc/nix/nix.conf ${BACKUP_FILE} fi -sudo cp "${HOME_MANAGER_DIR}/hwtr/nix.conf" /etc/nix/ +sudo cp "${HOME_MANAGER_DIR}/nix.conf" /etc/nix/ +sudo cp "${HOME_MANAGER_DIR}/${USER}/nix.conf" /etc/nix/ | echo "no nix.conf for ${USER}. Totally OK." sudo cp "${SCRIPT_DIR}/upload-to-cache.sh" /etc/nix/ sudo chmod +x /etc/nix/*.sh # Reload nix daemon so that new changes are applied.