diff options
Diffstat (limited to 'macos.local/flake')
| -rw-r--r-- | macos.local/flake/flake.lock | 18 | ||||
| -rw-r--r-- | macos.local/flake/home/core.nix.org | 8 | ||||
| -rw-r--r-- | macos.local/flake/home/programs/core.nix.org | 1 | ||||
| -rw-r--r-- | macos.local/flake/home/scripts/backup-org.sh.org | 13 | ||||
| -rw-r--r-- | macos.local/flake/home/scripts/core.nix.org | 4 | ||||
| -rw-r--r-- | macos.local/flake/system/homebrew.nix.org | 3 |
6 files changed, 36 insertions, 11 deletions
diff --git a/macos.local/flake/flake.lock b/macos.local/flake/flake.lock index 433b015..77744ae 100644 --- a/macos.local/flake/flake.lock +++ b/macos.local/flake/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1741894454, - "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1741794429, - "narHash": "sha256-4J46D8sOZ3UroVyGYKYMU3peq9gv0tjRX0KbZihWhhw=", + "lastModified": 1742165923, + "narHash": "sha256-WKzuVsHXjuxYjS9KxKdpoPWpT37LofyS5llSssEw058=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "2fb6b09b678a1ab258cf88e3ea4a966edceec6a8", + "rev": "95eac71bf52b271523d0ca81dbbeb3182990fc24", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1742169275, + "narHash": "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "5d9b5431f967007b3952c057fc92af49a4c5f3b2", "type": "github" }, "original": { diff --git a/macos.local/flake/home/core.nix.org b/macos.local/flake/home/core.nix.org index f92adc3..4beefd8 100644 --- a/macos.local/flake/home/core.nix.org +++ b/macos.local/flake/home/core.nix.org @@ -24,6 +24,14 @@ Set up home manager for my user account and import submodules. Define my user as "$HOME/.local/bin" "/usr/local/bin" "/opt/homebrew/bin" + "/opt/homebrew/sbin" ]; + + home.sessionSearchVariables = { + MANPATH = [ + "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/share/man" + "/usr/share/man" + ]; + }; } #+end_src diff --git a/macos.local/flake/home/programs/core.nix.org b/macos.local/flake/home/programs/core.nix.org index 835970f..2e79a50 100644 --- a/macos.local/flake/home/programs/core.nix.org +++ b/macos.local/flake/home/programs/core.nix.org @@ -23,6 +23,7 @@ Import configurations for programs and install programs with no configuration. cmake cmake-language-server curl + dasel dos2unix eza ffmpeg diff --git a/macos.local/flake/home/scripts/backup-org.sh.org b/macos.local/flake/home/scripts/backup-org.sh.org new file mode 100644 index 0000000..9eb646a --- /dev/null +++ b/macos.local/flake/home/scripts/backup-org.sh.org @@ -0,0 +1,13 @@ +#+title: Backup Org + +Backup my =~org= directory. +#+begin_src sh + #!/bin/sh + + dir="$(pwd)" + cd /Users/jjanzen/org/ || exit + git add -A + git commit -m 'backup' + git push + cd "$dir" || exit +#+end_src diff --git a/macos.local/flake/home/scripts/core.nix.org b/macos.local/flake/home/scripts/core.nix.org index e53c38c..a791e83 100644 --- a/macos.local/flake/home/scripts/core.nix.org +++ b/macos.local/flake/home/scripts/core.nix.org @@ -18,6 +18,10 @@ Import various scripts useful on my system. executable = true; source = ./remove-quarantine; }; + "./.local/bin/backup-org.sh" = { + executable = true; + source = ./backup-org.sh; + }; }; } #+end_src diff --git a/macos.local/flake/system/homebrew.nix.org b/macos.local/flake/system/homebrew.nix.org index 544685f..27748b8 100644 --- a/macos.local/flake/system/homebrew.nix.org +++ b/macos.local/flake/system/homebrew.nix.org @@ -53,6 +53,7 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat "poppler" # required by emacs-plus@30 + "gcc" "imagemagick" "jansson" "jpeg" @@ -82,7 +83,6 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat "gcc-arm-embedded" "ghostty" "gimp" - "ghidra" "godot" "gzdoom" "inkscape" @@ -101,7 +101,6 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat "syncthing" "thunderbird" "tor-browser" - "utm" "vlc" "whisky" "zotero" |