auto_master

@@ -1 +0,0 @@
-/etc/auto_master

brew-cask-list

@@ -1,79 +0,0 @@
-1password
-appcleaner
-aquamacs
-autodesk-fusion
-blackhole-16ch
-blackhole-2ch
-blender
-box-drive
-brave-browser
-cabal
-calibre
-cameracontroller
-cork
-dbeaver-community
-dcp-o-matic
-diffmerge
-discord
-distroav
-docker
-drawio
-element
-emby
-fantastical
-firefox
-freecad
-gimp
-git-credential-manager
-github
-gitkraken
-gpg-suite
-home-assistant
-inkscape
-iterm2
-jellyfin-media-player
-jitsi
-joplin
-karabiner-elements
-keybase
-libndi
-libreoffice
-little-snitch
-macdown
-maciasl
-mactex
-mattermost
-mediaelch
-minecraft
-mono-mdk-for-visual-studio
-mqtt-explorer
-mysqlworkbench
-native-access
-nheko
-obs
-opencore-configurator
-openscad
-oracle-jdk
-qmk-toolbox
-rar
-raspberry-pi-imager
-signal
-spamsieve
-spotify
-sqlitestudio
-steam
-superslicer
-synology-drive
-tinymediamanager
-unicodechecker
-vcv-rack
-virtualbox
-visual-studio-code
-vlc
-vnc-viewer
-webex
-whalebird
-whatsapp
-wireshark
-xquartz
-zotero

brew-formula-list

@@ -1 +0,0 @@
-mas

modules/darwin/casks.nix

@@ -5,7 +5,6 @@ _:
   "homebrew/cask/docker"
   "visual-studio-code"
   "iterm2"
-  "oracle-jdk"
 
   # Creatative tools
   "spotify"
@@ -19,6 +18,7 @@ _:
 
   # Communication Tools
   "discord"
+  "notion"
   "slack"
   "signal"
   "whatsapp"
@@ -41,10 +41,9 @@ _:
   "jellyfin-media-player"
   "vimediamanager"
   "mediaelch"
-  "handbrake"
-  "obs"
 
   # Productivity Tools
+  "raycast"
   "1Password"
   "zotero"
   "gpg-suite"
@@ -57,13 +56,6 @@ _:
   "macdown"
   "calibre"
   "superslicer"
-  "element"
-  "mqtt-explorer"
-  "virtualbox"
-  "autodesk-fusion"
-  "qmk-toolbox"
-  "dbeaver-community"
-  "sqlitestudio"
 
   # Browsers
   "google-chrome"

modules/darwin/home-manager.nix

@@ -11,7 +11,7 @@ let
   # Define the content of your file as a derivation
   myEmacsLauncher = pkgs.writeScript "emacs-launcher.command" ''
     #!/bin/sh
-    emacs &
+    emacsclient -c -n &
   '';
   sharedFiles = import ../shared/files.nix { inherit config pkgs; };
   additionalFiles = import ./files.nix { inherit user config pkgs; };
@@ -85,7 +85,6 @@ in
     dock = {
       enable = true;
       entries = [
-        { path = "/System/Applications/Launchpad.app/"; }
         { path = "/System/Applications/Mail.app/"; }
         { path = "/Applications/MailMate.app/"; }
         { path = "/Applications/1Password.app/"; }

modules/nixos/README.md

@@ -7,4 +7,5 @@
 ├── files.nix          # Non-Nix, static configuration files (now immutable!)
 ├── home-manager.nix   # Defines user programs
 ├── packages.nix       # List of packages to install for NixOS
+├── secrets.nix        # Age-encrypted secrets with agenix
 ```

modules/shared/config/emacs/init.el

@@ -3,7 +3,7 @@
 ;; -------------------------
 (defvar org-config-file "~/.local/share/src/nixos-config/modules/shared/config/emacs/config.org")
 (defvar default-config-file "~/.emacs.d/default-config.org")
-(defvar default-config-url "https://git.kolkman.org/olaf/nixos-config_to_rule_them_all/raw/branch/main/modules/shared/config/emacs/config.org")
+(defvar default-config-url "https://raw.githubusercontent.com/dustinlyons/nixos-config/9ad810c818b895c1f67f4daf21bbef31d8b5e8cd/shared/config/emacs/config.org")
 
 ;; -------------------------
 ;; Package Manager Setup

modules/shared/home-manager.nix

@@ -46,11 +46,11 @@ in
 
           # Emacs is my editor
           export ALTERNATE_EDITOR=""
-          export EDITOR="emacs -nw
+          export EDITOR="emacsclient -t"
-          export VISUAL="emacs"
+          export VISUAL="emacsclient -c -a emacs"
 
           e() {
-              emacs -nw "$@"
+              emacsclient -t "$@"
           }
 
           # nix shortcuts