Skip to content

Commit

Permalink
feat: act, fixes for rsync args, and toggleterm.nvim
Browse files Browse the repository at this point in the history
  • Loading branch information
tcarrio committed Dec 6, 2024
1 parent b33ebdf commit 1742219
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion darwin/mixins/users/tcarrio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
jdk11
kitty
lazygit
mysql
mariadb
neovim
tailscale

Expand Down
4 changes: 2 additions & 2 deletions darwin/modules/desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
# https://github.com/LnL7/nix-darwin/issues/214#issuecomment-2050027696
config = lib.mkIf config.oxc.desktop.applications.enable {
system.activationScripts.postUserActivation.text = ''
rsyncArgs="--archive --checksum --chmod=-w --copy-unsafe-links --delete"
declare -a rsyncArgs=("--archive" "--checksum" "--chmod=-w" "--copy-unsafe-links" "--delete")
apps_source="${config.system.build.applications}/Applications"
moniker="Nix Trampolines"
app_target_base="$HOME/Applications"
app_target="$app_target_base/$moniker"
mkdir -p "$app_target"
${pkgs.rsync}/bin/rsync $rsyncArgs "$apps_source/" "$app_target"
${pkgs.rsync}/bin/rsync "''${rsyncArgs[@]}" "$apps_source/" "$app_target"
'';
};
}
3 changes: 2 additions & 1 deletion darwin/workstation/sktc0/brews.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
_:
let
containerBrews = [ "docker" "docker-compose" "colima" ];
containerBrews = [ ]; # "docker" "docker-compose" "colima" ];
toolingBrews = [
"asdf"
"ca-certificates"
Expand Down Expand Up @@ -159,6 +159,7 @@ in
casks = [
"alfred"
"amethyst"
"docker"
"insomnia"
"secretive"
"sequel-ace"
Expand Down
4 changes: 2 additions & 2 deletions home-manager/mixins/console/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
dev = ''
if [ -d $HOME/0xc/nixcfg ]
nix develop $HOME/0xc/nixcfg#$argv[1] -c fish
nix develop $HOME/0xc/nixcfg#$argv[1]
else
nix develop github:( \
git remote -v \
Expand All @@ -130,7 +130,7 @@
| rev \
| sed 's/tig.//' \
| rev \
)#$argv[1] -c fish;
)#$argv[1];
end
'';
is-number = ''
Expand Down
4 changes: 4 additions & 0 deletions home-manager/mixins/console/neovim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@ vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })

-- [[ Configure ToggleTerm ]]
vim.keymap.set('', '<C-J>', '<cmd>ToggleTerm<CR>')
vim.keymap.set('t', '<C-j>', '<cmd>ToggleTerm<CR>')

-- [[ Configure Treesitter ]]
-- See `:help nvim-treesitter`
-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
Expand Down
4 changes: 2 additions & 2 deletions home-manager/mixins/desktop/darwin-applications.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# https://github.com/LnL7/nix-darwin/issues/214#issuecomment-2050027696
home.activation = {
rsync-home-manager-applications = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
rsyncArgs="--archive --checksum --chmod=-w --copy-unsafe-links --delete"
declare -a rsyncArgs=("--archive" "--checksum" "--chmod=-w" "--copy-unsafe-links" "--delete")
apps_source="$genProfilePath/home-path/Applications"
moniker="Home Manager Trampolines"
app_target_base="${config.home.homeDirectory}/Applications"
app_target="$app_target_base/$moniker"
mkdir -p "$app_target"
${pkgs.rsync}/bin/rsync $rsyncArgs "$apps_source/" "$app_target"
${pkgs.rsync}/bin/rsync "''${rsyncArgs[@]}" "$apps_source/" "$app_target"
'';
};
}
1 change: 1 addition & 0 deletions home-manager/mixins/users/tcarrio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Host glass
'';

packages = with pkgs; [
act
git-absorb
thefuck
cmatrix
Expand Down

0 comments on commit 1742219

Please sign in to comment.