From d238b7a81a25772f4e282e175af3fd4d7227b334 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Wed, 8 Jul 2026 11:10:01 -0600 Subject: [PATCH] remove modules directory no longer used --- modules/common/shell/work.nix | 67 ----------------------------------- modules/darwin/homebrew.nix | 56 ----------------------------- 2 files changed, 123 deletions(-) delete mode 100644 modules/common/shell/work.nix delete mode 100644 modules/darwin/homebrew.nix diff --git a/modules/common/shell/work.nix b/modules/common/shell/work.nix deleted file mode 100644 index 87c79c0d..00000000 --- a/modules/common/shell/work.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -{ - - home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin { - - home.packages = - let - ldap_scheme = "ldaps"; - magic_prefix = "take"; - ldap_port = 3269; - jq_parse = pkgs.writeShellScriptBin "ljq" '' - jq --slurp \ - --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?[^:]*:?): *(?.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)' - ''; - ldap_script = pkgs.writeShellScriptBin "ldap" '' - if ! [ "$LDAP_HOST" ]; then - echo "No LDAP_HOST specified!" - exit 1 - fi - SEARCH_FILTER="$@" - ldapsearch -LLL \ - -B -o ldif-wrap=no \ - -E pr=5000/prompt \ - -H "${ldap_scheme}://''${LDAP_HOST}:${builtins.toString ldap_port}" \ - -D "${pkgs.lib.toUpper magic_prefix}2\\${pkgs.lib.toLower config.user}" \ - -w "$(${pkgs._1password-cli}/bin/op item get T2 --fields label=password --reveal)" \ - -b "dc=''${LDAP_HOST//./,dc=}" \ - -s "sub" -x "(cn=''${SEARCH_FILTER})" \ - | ${jq_parse}/bin/ljq - ''; - ldapm_script = pkgs.writeShellScriptBin "ldapm" '' - if ! [ "$LDAP_HOST" ]; then - echo "No LDAP_HOST specified!" - exit 1 - fi - ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add' - ''; - ldapg_script = pkgs.writeShellScriptBin "ldapg" '' - if ! [ "$LDAP_HOST" ]; then - echo "No LDAP_HOST specified!" - exit 1 - fi - ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add' - ''; - ldapl_script = pkgs.writeShellScriptBin "ldapl" '' - if ! [ "$LDAP_HOST" ]; then - echo "No LDAP_HOST specified!" - exit 1 - fi - ${ldap_script}/bin/ldap "*$@*" | jq -r '.[].name' - ''; - in - [ - ldap_script - ldapm_script - ldapg_script - ldapl_script - jq_parse - ]; - }; -} diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix deleted file mode 100644 index 2442e9db..00000000 --- a/modules/darwin/homebrew.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - - # Homebrew - Mac-specific packages that aren't in Nix - config = lib.mkIf pkgs.stdenv.isDarwin { - - # # Requires Homebrew to be installed - system.activationScripts.preActivation.text = '' - if ! xcode-select --version 2>/dev/null; then - $DRY_RUN_CMD xcode-select --install - fi - if ! /opt/homebrew/bin/brew --version 2>/dev/null; then - $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - fi - ''; - - # Add homebrew paths to CLI path - home-manager.users.${config.user}.home.sessionPath = [ - "/opt/homebrew/bin/" - "/opt/homebrew/opt/trash/bin/" - ]; - - homebrew = { - enable = true; - onActivation = { - autoUpdate = false; # Don't update during rebuild - cleanup = "zap"; # Uninstall all programs not declared - upgrade = true; - }; - global = { - brewfile = true; # Run brew bundle from anywhere - }; - brews = [ - "trash" # Delete files and folders to trash instead of rm - "jiratui" # Terminal program to manage Jira - ]; - casks = [ - "1password" # 1Password will not launch from Nix on macOS - # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1) - "keybase" # GUI on Nix not available for macOS - # "logitech-g-hub" # Mouse and keyboard management - "logitune" # Logitech webcam firmware - "meetingbar" # Show meetings in menu bar - "scroll-reverser" # Different scroll style for mouse vs. trackpad - "notunes" # Don't launch Apple Music with the play button - "steam" # Not packaged for Nixon macOS - "epic-games" # Not packaged for Nix - ]; - }; - }; -}