Compare commits
No commits in common. "84a69f863817ce49fc7811285c2cd90bc7f6529e" and "632104be6905b5cf363b67c80415063d739d4a35" have entirely different histories.
84a69f8638
...
632104be69
12
flake.lock
12
flake.lock
|
@ -459,11 +459,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685168767,
|
"lastModified": 1684215771,
|
||||||
"narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=",
|
"narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262",
|
"rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -740,11 +740,11 @@
|
||||||
"yants": "yants_2"
|
"yants": "yants_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684882168,
|
"lastModified": 1684180498,
|
||||||
"narHash": "sha256-Yu1yw1sPWZsXe7BX7HaHg+O8fWKHCpy/AwgGfBdhivw=",
|
"narHash": "sha256-kA58ms4yunOVPhe3r7V0IIKeWUV+vl4r2GTcfFfYW5o=",
|
||||||
"owner": "divnix",
|
"owner": "divnix",
|
||||||
"repo": "std",
|
"repo": "std",
|
||||||
"rev": "959f54d6698ff7fea01e4e6d8e5d7d95fcf66844",
|
"rev": "45b431ae09df98e046bcc8271aa209bdfc87444d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -72,7 +72,7 @@ Plug('folke/trouble.nvim') -- File-grouped workspace diagnostics
|
||||||
Plug('tpope/vim-dispatch') -- Allows quick build/compile/test vim commands
|
Plug('tpope/vim-dispatch') -- Allows quick build/compile/test vim commands
|
||||||
Plug('clojure-vim/vim-jack-in') -- Clojure: ":Boot", ":Clj", ":Lein"
|
Plug('clojure-vim/vim-jack-in') -- Clojure: ":Boot", ":Clj", ":Lein"
|
||||||
Plug('radenling/vim-dispatch-neovim') -- Add support for neovim's terminal emulator
|
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('gennaro-tedesco/nvim-jqx') -- JSON formatter (use :Jqx*)
|
||||||
Plug('kylechui/nvim-surround') -- surrounds with tags/parenthesis
|
Plug('kylechui/nvim-surround') -- surrounds with tags/parenthesis
|
||||||
Plug('simrat39/rust-tools.nvim') -- config rust-analyzer and nvim integration
|
Plug('simrat39/rust-tools.nvim') -- config rust-analyzer and nvim integration
|
||||||
|
@ -87,6 +87,7 @@ Plug('m-demare/hlargs.nvim') -- highlights arguments; great for f
|
||||||
Plug('folke/todo-comments.nvim') -- Highlights TODO
|
Plug('folke/todo-comments.nvim') -- Highlights TODO
|
||||||
|
|
||||||
-- other utilities
|
-- 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/nvim-treesitter-context') -- Top one-liner context of func/class scope
|
||||||
Plug('nvim-treesitter/playground') -- Sees Treesitter AST - less hair pulling, more PRs
|
Plug('nvim-treesitter/playground') -- Sees Treesitter AST - less hair pulling, more PRs
|
||||||
Plug('saadparwaiz1/cmp_luasnip') -- snippet engine
|
Plug('saadparwaiz1/cmp_luasnip') -- snippet engine
|
||||||
|
@ -97,7 +98,6 @@ Plug('mickael-menu/zk-nvim') -- Zettelkasten
|
||||||
-- `gsu` -> UPPER_CASE (CONSTs), `gsk` -> kebab-case (Clojure), `gsK` -> Title-Kebab-Case
|
-- `gsu` -> UPPER_CASE (CONSTs), `gsk` -> kebab-case (Clojure), `gsK` -> Title-Kebab-Case
|
||||||
-- `gs.` -> dot.case (R)
|
-- `gs.` -> dot.case (R)
|
||||||
Plug('arthurxavierx/vim-caser') -- switch cases
|
Plug('arthurxavierx/vim-caser') -- switch cases
|
||||||
Plug('pegasust/tsql.nvim') -- workspace code intelligence
|
|
||||||
|
|
||||||
---------
|
---------
|
||||||
vim.call('plug#end')
|
vim.call('plug#end')
|
||||||
|
@ -775,6 +775,7 @@ require("rust-tools").setup {
|
||||||
-- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error"
|
-- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error"
|
||||||
on_initialized = function()
|
on_initialized = function()
|
||||||
require('inlay-hints').set_all()
|
require('inlay-hints').set_all()
|
||||||
|
|
||||||
end,
|
end,
|
||||||
-- automatically call RustReloadWorkspace when writing to a Cargo.toml file.
|
-- automatically call RustReloadWorkspace when writing to a Cargo.toml file.
|
||||||
reload_workspace_from_cargo_toml = true,
|
reload_workspace_from_cargo_toml = true,
|
||||||
|
|
|
@ -21,11 +21,6 @@ set-option -g renumber-windows on
|
||||||
# set -g status-left " "
|
# set -g status-left " "
|
||||||
|
|
||||||
# Keybinds
|
# Keybinds
|
||||||
# Enter copy mode with 'v' in vi mode
|
|
||||||
bind-key -Tcopy-mode-vi v send-keys -X begin-selection
|
|
||||||
|
|
||||||
# Copy selection with 'y' in vi mode
|
|
||||||
bind-key -Tcopy-mode-vi y send-keys -X copy-selection-and-cancel
|
|
||||||
set-window-option -g mode-keys vi
|
set-window-option -g mode-keys vi
|
||||||
|
|
||||||
# # Log
|
# # Log
|
||||||
|
|
|
@ -803,11 +803,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685189510,
|
"lastModified": 1684189380,
|
||||||
"narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=",
|
"narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd",
|
"rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -938,11 +938,11 @@
|
||||||
"topiary": "topiary"
|
"topiary": "topiary"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685111201,
|
"lastModified": 1684220170,
|
||||||
"narHash": "sha256-WiaWxL1mBvHjOWGfC082zj/Nd1aaJt+Ga+KuzPQZ5dk=",
|
"narHash": "sha256-Vl6KHfZCmG016cN3xkaHgVtB9p2eODwjHQuMXF3KUsg=",
|
||||||
"owner": "tweag",
|
"owner": "tweag",
|
||||||
"repo": "nickel",
|
"repo": "nickel",
|
||||||
"rev": "afdaff57cec860b27e9cdab79fafc2ee724b0cff",
|
"rev": "f11b7b09e2fbbcaa6384e511ef95cde1f4aae93a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1182,11 +1182,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_12": {
|
"nixpkgs_12": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685168767,
|
"lastModified": 1684215771,
|
||||||
"narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=",
|
"narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262",
|
"rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1753,11 +1753,11 @@
|
||||||
"nixpkgs": "nixpkgs_13"
|
"nixpkgs": "nixpkgs_13"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685240871,
|
"lastModified": 1684203630,
|
||||||
"narHash": "sha256-bOCbP0lWTjhmrPcdyuFD/yx/38CKkzC2TNXmBzZSLJA=",
|
"narHash": "sha256-ZOWNixdHU4qFZUgYNEULFB3ifctMQO9H4Oo+Zrz+4L8=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "aa1b08de9ca770534ad750dccc70cebd95c15e26",
|
"rev": "65c3f2655f52a81e1b3e629d4c07df4873d0f2bb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -191,7 +191,6 @@
|
||||||
# FIXME: this actually does not exist
|
# FIXME: this actually does not exist
|
||||||
base.keepass.path = "/Users/htran/keepass.kdbx";
|
base.keepass.path = "/Users/htran/keepass.kdbx";
|
||||||
base.alacritty.font.size = 11.0;
|
base.alacritty.font.size = 11.0;
|
||||||
base.alacritty.font.family = "DroidSansM Nerd Font";
|
|
||||||
base.git.name = "Hung";
|
base.git.name = "Hung";
|
||||||
base.git.email = "htran@egihosting.com";
|
base.git.email = "htran@egihosting.com";
|
||||||
}
|
}
|
||||||
|
@ -200,6 +199,7 @@
|
||||||
pkgs.postman
|
pkgs.postman
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
nerd_font_module
|
||||||
{ base.keepass.enable = pkgs.lib.mkForce false; }
|
{ base.keepass.enable = pkgs.lib.mkForce false; }
|
||||||
];
|
];
|
||||||
extraSpecialArgs = mkModuleArgs {
|
extraSpecialArgs = mkModuleArgs {
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
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
|
|
|
@ -1,4 +0,0 @@
|
||||||
accept-flake-config = true
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
post-build-hook = /etc/nix/upload-to-cache.sh
|
|
||||||
trusted-users = root htran hungtran hwtr
|
|
|
@ -15,8 +15,7 @@ if [ -f /etc/nix/nix.conf ]; then
|
||||||
echo "overwriting /etc/nix/nix.conf. Please find latest backup in ${BACKUP_FILE}"
|
echo "overwriting /etc/nix/nix.conf. Please find latest backup in ${BACKUP_FILE}"
|
||||||
sudo cp /etc/nix/nix.conf ${BACKUP_FILE}
|
sudo cp /etc/nix/nix.conf ${BACKUP_FILE}
|
||||||
fi
|
fi
|
||||||
sudo cp "${HOME_MANAGER_DIR}/nix.conf" /etc/nix/
|
sudo cp "${HOME_MANAGER_DIR}/hwtr/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 cp "${SCRIPT_DIR}/upload-to-cache.sh" /etc/nix/
|
||||||
sudo chmod +x /etc/nix/*.sh
|
sudo chmod +x /etc/nix/*.sh
|
||||||
# Reload nix daemon so that new changes are applied.
|
# Reload nix daemon so that new changes are applied.
|
||||||
|
|
Loading…
Reference in New Issue