this repo has no description
Misc macos updates
+152
-79
+13
-6
.config/Code/User/settings.json
+13
-6
.config/Code/User/settings.json
···
313
313
"c-cpp-flylint.lizard.enable": false,
314
314
"c-cpp-flylint.run": "onSave",
315
315
316
+
"chat.commandCenter.enabled": false,
316
317
"chat.editor.fontFamily": "'Monaspace Krypton Var', 'Input Mono', Monaco, monospace",
317
318
318
319
"clangd.restartAfterCrash": false,
···
466
467
"editor.lineNumbers": "on",
467
468
"editor.renderControlCharacters": true,
468
469
"editor.glyphMargin": true,
469
-
"editor.renderWhitespace": "none",
470
+
"editor.renderWhitespace": "selection",
470
471
"editor.rulers": [
471
472
80,
472
473
88, // `black`'s default max length
···
501
502
"attribute.defaultLibrary:rust": "#66D9EF",
502
503
"builtinAttribute:rust": "#66D9EF",
503
504
"decorator.defaultLibrary:rust": "#66D9EF",
504
-
"comment.documentation:rust": {
505
+
"comment.documentation": {
505
506
"bold": true,
506
507
},
507
508
"derive.defaultLibrary:rust": "#A6E22E",
···
950
951
"githubPullRequests.queries": [
951
952
{
952
953
"label": "Waiting For My Review",
953
-
"query": "is:open review-requested:${user}",
954
+
"query": "repo:${owner}/${repository} is:open review-requested:${user}"
954
955
},
955
956
{
956
957
"label": "Reviewed By Me",
957
-
"query": "is:open reviewed-by:${user} -author:${user}"
958
+
"query": "repo:${owner}/${repository} is:open reviewed-by:${user} -author:${user}"
958
959
},
959
960
{
960
961
"label": "Assigned To Me",
961
-
"query": "is:open assignee:${user}"
962
+
"query": "repo:${owner}/${repository} is:open assignee:${user}"
962
963
},
963
964
{
964
965
"label": "Created By Me",
965
-
"query": "is:open author:${user}"
966
+
"query": "repo:${owner}/${repository} is:open author:${user}"
966
967
}
967
968
],
968
969
"githubPullRequests.terminalLinksHandler": "github",
···
1111
1112
"PYENV_VERSION": "system"
1112
1113
},
1113
1114
1115
+
"Lua.addonManager.enable": false,
1114
1116
"Lua.workspace.library": [
1115
1117
"/opt/homebrew/share/nvim/runtime",
1116
1118
"/usr/local/share/nvim/runtime",
···
1248
1250
// MARK: Q/R
1249
1251
1250
1252
"remote.SSH.configFile": "~/.ssh/vscode_config",
1253
+
"remote.SSH.showLoginTerminal": false,
1254
+
"remote.SSH.useLocalServer": true,
1255
+
"remote.SSH.useExecServer": false,
1256
+
"remote.SSH.enableRemoteCommand": true,
1251
1257
1252
1258
"robot.completions.keywords.format": "Title Case",
1253
1259
"robot.completions.section_headers.form": "plural",
···
1450
1456
"terminal.integrated.profiles.linux": {
1451
1457
"bash": {
1452
1458
"path": "bash",
1459
+
"args": ["-l"],
1453
1460
"icon": "terminal-bash",
1454
1461
},
1455
1462
"fish": {
-3
.config/fish/config.fish
-3
.config/fish/config.fish
+2
-4
.config/home-manager/home.nix
+2
-4
.config/home-manager/home.nix
···
33
33
34
34
nix.settings = {
35
35
repl-overlays = "${config.xdg.configHome}/nix/repl-overlays.nix";
36
-
# Use extra- to avoid overwriting settings from nix-darwin
36
+
# Use extra- to avoid overwriting settings from nix-darwin/nixos
37
37
extra-experimental-features = [
38
38
"repl-flake"
39
-
# TODO: lix doesn't seem to be taking effect properly in nixos-wsl
40
-
# "pipe-operator"
39
+
"pipe-operator"
41
40
];
42
41
43
42
# TODO: try out default-flake
44
43
# https://github.com/nix-community/home-manager/issues/5753
45
44
46
45
extra-plugin-files = "${config.xdg.configHome}/nix/plugins";
47
-
use-xdg-base-directories = true;
48
46
};
49
47
# Annoying, idk how to resolve this...
50
48
# https://github.com/nix-community/home-manager/issues/5753
+2
-2
.config/newtabtools/personal/newtabtools.zip
+2
-2
.config/newtabtools/personal/newtabtools.zip
+1
-1
.config/nix-darwin/homebrew.nix
+1
-1
.config/nix-darwin/homebrew.nix
···
47
47
# Zap might be nice but it's scary, for example firefox@nightly zap stanza
48
48
# also deletes stable firefox settings and stuff, so it's probably best
49
49
# to zap on a case-by-case basis instead. AppCleaner should help.
50
-
cleanup = "uninstall";
50
+
# cleanup = "uninstall";
51
51
};
52
52
53
53
global.autoUpdate = false;
+6
-6
.config/nix-darwin/homebrew/aarch64-darwin.nix
+6
-6
.config/nix-darwin/homebrew/aarch64-darwin.nix
···
15
15
system = "x86_64-darwin";
16
16
17
17
configuration.homebrew = {
18
-
inherit (config.homebrew) enable global taps;
18
+
inherit (config.homebrew) enable global; # taps;
19
19
onActivation = {
20
20
inherit (config.homebrew.onActivation) cleanup extraFlags;
21
21
};
···
28
28
};
29
29
30
30
# This seems kinda hacky, but I guess it works??
31
-
activateHomebrew = pkgs.writeScript "activate-x86_64-brew" ''
32
-
#!/usr/bin/env bash
33
-
echo -n "x86_64 " >&2
34
-
${x86_64-brew.config.system.activationScripts.homebrew.text}
35
-
'';
31
+
activateHomebrew = pkgs.writeScript "activate-x86_64-brew"
32
+
(''
33
+
#!/usr/bin/env bash
34
+
echo -n "x86_64 " >&2
35
+
'' + x86_64-brew.config.system.activationScripts.homebrew.text);
36
36
in
37
37
{
38
38
# Inject the x86_64 brew activation into our top-level darwin activation
+1
.config/nix-darwin/homebrew/personal.nix
+1
.config/nix-darwin/homebrew/personal.nix
+63
.config/nixpkgs/patches/nix-darwin/0001-Use-ComputerName-instead-of-LocalHostName.patch
+63
.config/nixpkgs/patches/nix-darwin/0001-Use-ComputerName-instead-of-LocalHostName.patch
···
1
+
From 5fbe04d39cd7e397508091ba98a92b692ec2ef0f Mon Sep 17 00:00:00 2001
2
+
From: Ian Chamberlain <ian.h.chamberlain@gmail.com>
3
+
Date: Mon, 3 Feb 2025 22:37:34 -0500
4
+
Subject: [PATCH] Use ComputerName instead of LocalHostName
5
+
6
+
See https://github.com/LnL7/nix-darwin/pull/676 for discussion about why
7
+
to prefer one or the other; ComputerName seems more stable in my
8
+
experience.
9
+
---
10
+
README.md | 4 ++--
11
+
pkgs/nix-tools/darwin-rebuild.sh | 2 +-
12
+
2 files changed, 3 insertions(+), 3 deletions(-)
13
+
14
+
diff --git a/README.md b/README.md
15
+
index b0f095a..32a9c72 100644
16
+
--- a/README.md
17
+
+++ b/README.md
18
+
@@ -43,11 +43,11 @@ ### Step 1. Creating `flake.nix`
19
+
# To use Nixpkgs unstable:
20
+
nix flake init -t nix-darwin/master
21
+
# To use Nixpkgs 24.11:
22
+
nix flake init -t nix-darwin/nix-darwin-24.11
23
+
24
+
-sed -i '' "s/simple/$(scutil --get LocalHostName)/" flake.nix
25
+
+sed -i '' "s/simple/$(scutil --get ComputerName)/" flake.nix
26
+
```
27
+
28
+
Make sure to change `nixpkgs.hostPlatform` to `aarch64-darwin` if you are using Apple Silicon.
29
+
30
+
</details>
31
+
@@ -76,11 +76,11 @@ # To use Nixpkgs 24.11:
32
+
};
33
+
};
34
+
}
35
+
```
36
+
37
+
-Make sure to replace `Johns-MacBook` with your hostname which you can find by running `scutil --get LocalHostName`.
38
+
+Make sure to replace `Johns-MacBook` with your hostname which you can find by running `scutil --get ComputerName`.
39
+
40
+
Make sure to set `nixpkgs.hostPlatform` in your `configuration.nix` to either `x86_64-darwin` (Intel) or `aarch64-darwin` (Apple Silicon).
41
+
42
+
</details>
43
+
44
+
diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh
45
+
index 8f207a7..8c958bf 100644
46
+
--- a/pkgs/nix-tools/darwin-rebuild.sh
47
+
+++ b/pkgs/nix-tools/darwin-rebuild.sh
48
+
@@ -156,11 +156,11 @@ if [[ -n "$flake" ]]; then
49
+
if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then
50
+
flake="${BASH_REMATCH[1]}"
51
+
flakeAttr="${BASH_REMATCH[2]}"
52
+
fi
53
+
if [[ -z "$flakeAttr" ]]; then
54
+
- flakeAttr=$(scutil --get LocalHostName)
55
+
+ flakeAttr=$(scutil --get ComputerName)
56
+
fi
57
+
flakeAttr=darwinConfigurations.${flakeAttr}
58
+
fi
59
+
60
+
if [ "$action" != build ]; then
61
+
--
62
+
2.44.1
63
+
+10
-3
.config/yadm/alt/Library/Application Support/Stretchly/config.json##os.Darwin
+10
-3
.config/yadm/alt/Library/Application Support/Stretchly/config.json##os.Darwin
···
1
1
{
2
2
"__internal__": {
3
3
"migrations": {
4
-
"version": "1.15.1"
4
+
"version": "1.17.2"
5
5
}
6
6
},
7
7
"allScreens": true,
8
8
"appExclusions": [],
9
9
"appExclusionsCheckInterval": 1000,
10
10
"audio": "reverie",
11
+
"blurredBackground": false,
11
12
"break": true,
12
13
"breakDuration": 300000,
13
14
"breakIdeas": [
···
262
263
"breakNotificationInterval": 30000,
263
264
"breakPostponableDurationPercent": 30,
264
265
"breakPostpone": true,
265
-
"breakPostponeTime": 300000,
266
266
"breakPostponesLimit": 1,
267
+
"breakPostponeTime": 300000,
267
268
"breakStartSoundPlaying": false,
268
269
"breakStrictMode": false,
269
270
"breakWindowHeight": 0.9,
···
489
490
"microbreakNotificationInterval": 10000,
490
491
"microbreakPostponableDurationPercent": 30,
491
492
"microbreakPostpone": true,
492
-
"microbreakPostponeTime": 120000,
493
493
"microbreakPostponesLimit": 1,
494
+
"microbreakPostponeTime": 120000,
494
495
"microbreakStartSoundPlaying": false,
495
496
"microbreakStrictMode": false,
496
497
"miniBreakAudio": "reverie",
···
501
502
"naturalBreaksInactivityResetTime": 300000,
502
503
"notifyNewVersion": true,
503
504
"opacity": 0.75,
505
+
"pauseBreaksFor1HourShortcut": "",
506
+
"pauseBreaksFor2HoursShortcut": "",
507
+
"pauseBreaksFor30MinutesShortcut": "",
508
+
"pauseBreaksFor5HoursShortcut": "",
504
509
"pauseBreaksToggleShortcut": "",
510
+
"pauseBreaksUntilMorningShortcut": "",
505
511
"pauseForSuspendOrLock": true,
506
512
"posLatitude": 42.37,
507
513
"posLongitude": 71.1,
···
509
515
"screen": "primary",
510
516
"showBreaksAsRegularWindows": false,
511
517
"showTrayIcon": true,
518
+
"showTrayMenuInStrictMode": false,
512
519
"silentNotifications": false,
513
520
"skipToNextLongBreakShortcut": "",
514
521
"skipToNextMiniBreakShortcut": "",
.ssh/config
.ssh/config
This is a binary file and will not be displayed.
.ssh/vscode_config
.ssh/vscode_config
This is a binary file and will not be displayed.
+54
-54
.vimrc
+54
-54
.vimrc
···
94
94
set hlsearch
95
95
syntax on
96
96
97
+
if exists('g:vscode')
98
+
finish
99
+
endif
97
100
101
+
" =============================================================================
102
+
" Ordinary vim/neovim settings that don't apply in VSCode after this point
103
+
" =============================================================================
104
+
set mouse=a
98
105
99
-
" Editor-specific settings
100
-
if !exists('g:vscode')
101
-
" Ordinary vim/neovim settings that don't apply in VSCode
102
-
set mouse=a
106
+
highlight ColorColumn ctermbg=7
107
+
set colorcolumn=80
108
+
set ruler
103
109
104
-
highlight ColorColumn ctermbg=7
105
-
set colorcolumn=80
106
-
set ruler
110
+
set number
107
111
108
-
set number
112
+
if has('termguicolors') && !exists("$TMUX")
113
+
set termguicolors
114
+
endif
109
115
110
-
if has('termguicolors') && !exists("$TMUX")
111
-
set termguicolors
112
-
endif
113
-
114
-
colorscheme Monokai
116
+
colorscheme Monokai
115
117
116
-
highlight! link Search IncSearch
118
+
highlight! link Search IncSearch
117
119
118
-
if exists("$TMUX")
119
-
" Apparently powerline just totally breaks vim in tmux, so have to
120
-
" completely disable it for now, until it's fixed or I find a workaround
121
-
let g:loaded_airline = 1
122
-
else
123
-
" vim-airline options
124
-
let g:airline_powerline_fonts = 1
120
+
if exists("$TMUX")
121
+
" Apparently powerline just totally breaks vim in tmux, so have to
122
+
" completely disable it for now, until it's fixed or I find a workaround
123
+
let g:loaded_airline = 1
124
+
else
125
+
" vim-airline options
126
+
let g:airline_powerline_fonts = 1
125
127
126
-
" let g:airline_extensions = []
127
-
let g:airline_highlighting_cache = 1
128
-
let g:airline#extensions#whitespace#enabled = 1
128
+
" let g:airline_extensions = []
129
+
let g:airline_highlighting_cache = 1
130
+
let g:airline#extensions#whitespace#enabled = 1
129
131
130
-
let g:airline#extensions#tabline#enabled = 1
131
-
let g:airline#extensions#tabline#fnamemod = ':p:~'
132
+
let g:airline#extensions#tabline#enabled = 1
133
+
let g:airline#extensions#tabline#fnamemod = ':p:~'
132
134
133
-
let g:airline#extensions#tabline#show_buffers = 1
134
-
endif
135
+
let g:airline#extensions#tabline#show_buffers = 1
136
+
endif
135
137
136
-
" Code from:
137
-
" http://stackoverflow.com/questions/5585129/pasting-code-into-terminal-window-into-vim-on-mac-os-x
138
-
" then https://coderwall.com/p/if9mda
139
-
" and then https://github.com/aaronjensen/vimfiles/blob/59a7019b1f2d08c70c28a41ef4e2612470ea0549/plugin/terminaltweaks.vim
140
-
" to fix the escape time problem with insert mode.
141
-
"
142
-
" Docs on bracketed paste mode:
143
-
" http://www.xfree86.org/current/ctlseqs.html
144
-
" Docs on mapping fast escape codes in vim
145
-
" http://vim.wikia.com/wiki/Mapping_fast_keycodes_in_terminal_Vim
138
+
" Code from:
139
+
" http://stackoverflow.com/questions/5585129/pasting-code-into-terminal-window-into-vim-on-mac-os-x
140
+
" then https://coderwall.com/p/if9mda
141
+
" and then https://github.com/aaronjensen/vimfiles/blob/59a7019b1f2d08c70c28a41ef4e2612470ea0549/plugin/terminaltweaks.vim
142
+
" to fix the escape time problem with insert mode.
143
+
"
144
+
" Docs on bracketed paste mode:
145
+
" http://www.xfree86.org/current/ctlseqs.html
146
+
" Docs on mapping fast escape codes in vim
147
+
" http://vim.wikia.com/wiki/Mapping_fast_keycodes_in_terminal_Vim
146
148
147
-
if exists("g:loaded_bracketed_paste")
148
-
finish
149
-
endif
149
+
if !exists("g:loaded_bracketed_paste")
150
150
let g:loaded_bracketed_paste = 1
151
151
152
152
let &t_ti .= "\<Esc>[?2004h"
···
165
165
vmap <expr> <f28> XTermPasteBegin("c")
166
166
cmap <f28> <nop>
167
167
cmap <f29> <nop>
168
+
endif
168
169
169
-
" https://stackoverflow.com/a/5563142/14436105
170
-
nnoremap <silent> <Tab> :if &modifiable && !&readonly && &modified <CR>
171
-
\ :write<CR> :endif<CR>:bnext<CR>
172
-
nnoremap <silent> <S-Tab> :if &modifiable && !&readonly && &modified <CR>
173
-
\ :write<CR> :endif<CR>:bprevious<CR>
174
-
nmap <silent> <Leader>n <Tab>
175
-
nmap <silent> <Leader>p <S-Tab>
176
-
nmap <silent> <Leader>N <S-Tab>
170
+
" https://stackoverflow.com/a/5563142/14436105
171
+
nnoremap <silent> <Tab> :if &modifiable && !&readonly && &modified <CR>
172
+
\ :write<CR> :endif<CR>:bnext<CR>
173
+
nnoremap <silent> <S-Tab> :if &modifiable && !&readonly && &modified <CR>
174
+
\ :write<CR> :endif<CR>:bprevious<CR>
175
+
nmap <silent> <Leader>n <Tab>
176
+
nmap <silent> <Leader>p <S-Tab>
177
+
nmap <silent> <Leader>N <S-Tab>
177
178
178
-
" May want to adjust these to close window sometimes... idk
179
-
nnoremap <silent> <Leader>wd :if &modifiable && !&readonly && &modified <CR>
180
-
\ :write<CR> :endif<CR>:bdelete<CR>
181
-
nnoremap <silent> <Leader>d :bdelete<CR>
182
-
endif
179
+
" May want to adjust these to close window sometimes... idk
180
+
nnoremap <silent> <Leader>wd :if &modifiable && !&readonly && &modified <CR>
181
+
\ :write<CR> :endif<CR>:bdelete<CR>
182
+
nnoremap <silent> <Leader>d :bdelete<CR>