diff --git a/homes/common.nix b/homes/common.nix index f387f4b..f3897fb 100644 --- a/homes/common.nix +++ b/homes/common.nix @@ -94,9 +94,6 @@ in { installRunic = lib.hm.dag.entryAfter [ "writeBoundary" ] '' run ${pkgs.julia-bin}/bin/julia --project=@runic --startup-file=no -e 'using Pkg; Pkg.add(name="Runic", version="${runic_version}")' ''; - installJuliaFormatter = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - run ${pkgs.julia-bin}/bin/julia --project=@JuliaFormatter --startup-file=no -e 'using Pkg; Pkg.add(name="JuliaFormatter", version="2.1.6")' - ''; }; }; programs = { diff --git a/homes/desktop.nix b/homes/desktop.nix index 0e376ce..7c0fe48 100644 --- a/homes/desktop.nix +++ b/homes/desktop.nix @@ -25,6 +25,7 @@ quarto roboto-slab shellcheck + sqlitebrowser tex-fmt woodpecker-cli (texlive.combine { inherit (texlive) scheme-basic latex-bin latexmk; }) diff --git a/homes/linux-desktop.nix b/homes/linux-desktop.nix index 6d78716..3e19754 100644 --- a/homes/linux-desktop.nix +++ b/homes/linux-desktop.nix @@ -6,7 +6,7 @@ in { imports = [ ./../programs/plasma.nix ]; home = { - packages = with pkgs; [ kwalletcli sqlitebrowser custom-pkgs.sc4pac ]; + packages = with pkgs; [ kwalletcli custom-pkgs.sc4pac ]; sessionVariables = { ZED_WINDOW_DECORATIONS = "server"; }; }; services = { diff --git a/programs/firefox.nix b/programs/firefox.nix index cd29552..9512b83 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -75,7 +75,7 @@ }) ]; search = { - default = "Kagi"; + default = "Milliron X Search"; privateDefault = "Milliron X Search"; force = true; engines = { @@ -108,41 +108,6 @@ updateInterval = 7 * 24 * 60 * 60 * 1000; definedAliases = [ "@pxt" ]; }; - "Kagi" = { - urls = [ - { - rels = [ "results" ]; - type = "text/html"; - method = "GET"; - template = "https://kagi.com/search?q={searchTerms}"; - } - { - rels = [ "suggestions" ]; - type = "application/x-suggestions+json"; - method = "GET"; - template = - "https://kagisuggest.com/api/autosuggest?q={searchTerms}"; - } - ]; - icon = "https://kagi.com/favicon.ico"; - updateInterval = 24 * 60 * 60 * 1000; # every day - definedAliases = [ "@kg" ]; - }; - # Based on which bangs I use, I should also add (in no particular order): - # - Dockerhub - # - WineHQ - # - nixpkgs - # - YouTube - # - IMDB - # - Flathub - # - USPS/UPS/DHL/FedEx - # - PubMed - # - Cabi Abstracts? - # - Conda - # - Marginalia - # - AlternativeTo - # - Wikipedia - # - Google Scholar }; }; settings = { diff --git a/programs/zed.nix b/programs/zed.nix index 64f5d3f..8917582 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -4,6 +4,7 @@ extensions = [ "basher" "clojure" + "cspell" "dockerfile" "earthfile" "git-firefly" @@ -18,12 +19,27 @@ ]; userSettings = { agent = { - use_modifier_to_send = true; default_model = { provider = "copilot_chat"; model = "gpt-4.1"; }; }; + auto_install_extensions = { + basher = true; + clojure = true; + cspell = true; + dockerfile = true; + earthfile = true; + git-firefly = true; + html = true; + julia = true; + latex = true; + macos-classic = true; + nix = true; + r = true; + toml = true; + xml = true; + }; buffer_font_family = "FiraCode Nerd Font"; buffer_font_size = 11; features = { edit_prediction_provider = "zed"; }; @@ -33,8 +49,6 @@ external = { command = "julia"; arguments = [ - "--project=@JuliaFormatter" - "--startup-file=no" "-e" "using JuliaFormatter; print(format_text(String(read(stdin))));" ]; diff --git a/secrets.nix b/secrets.nix index 15c9717..16d37c3 100644 --- a/secrets.nix +++ b/secrets.nix @@ -19,5 +19,4 @@ in { ++ [ bosephus-host ]; "secrets/pihole.age".publicKeys = system-administrators ++ [ bosephus-host ]; "secrets/ansible-vault-password.age".publicKeys = system-administrators; - "secrets/darwin-policies-json.age".publicKeys = system-administrators; } diff --git a/secrets/darwin-policies-json.age b/secrets/darwin-policies-json.age deleted file mode 100644 index 4cde4f3..0000000 --- a/secrets/darwin-policies-json.age +++ /dev/null @@ -1,14 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 bN6E9A pP/KN1DuadjXdcmn88HMfbPx3fJtfVPsk6thr0nkdCM -81yMhheSMDQAl0c40l99kE8LgpGFFaO0oM/i04sfYe8 --> ssh-ed25519 1g/xww /Kp3JUItkd3sWvOD6Te6OqynKnHCE3N4EKC6IVBZzRc -CNWaNgLMNXpLzx9jNZR5sToouRCJxNDife+dTMhw/mc --> ssh-ed25519 +kBihw qRIX7qPG2+/gsfvEJBp1tAS71fAXeQ42RBk7EjaWdUM -gjlHOUzMZuWZKLLdn/vTDjhDzKul7J0tzvCFwE/eRWE --> ssh-ed25519 dbKeHw BIkHWULlDEbu+/6pKVhbQccfgGQZy05V5ZrsmOxuilI -G/B1TLuaIi4dnlyp1bo0wCjyBJcfOvv2ecuWLo7Cgl0 ---- t4O2Yxqi3K+siT5JhDW55lHPw2uQ05Y6rcDOPzXbAIY -bd 0Sa^O>&42/xZ/(㿔3K -l|p-W,[0"'B~A.E˝Gt -]q':(ѝ =WW8$E(! \ No newline at end of file diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index a07cc97..18263d8 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -33,46 +33,6 @@ system.keyboard.enableKeyMapping = true; system.primaryUser = "millironx"; - # nix-darwin doesn't provide a nice injection point for running activation - # scripts like home-manager does. In other words, we can't add an arbitrary - # number of activation scripts with well-defined entry points into the system - # activation process. Instead, we can rely on these three obscure and - # discouraged activation points to bootstrap stuff: - # https://github.com/nix-darwin/nix-darwin/blob/e04a388232d9a6ba56967ce5b53a8a6f713cdfcf/modules/system/activation-scripts.nix#L152-L156 - # In this case, we are using the postActivation section (since it runs after - # homebrew) to unquarantine any casks that might have updated and are now - # in quarantine again. - system.activationScripts.postActivation.text = '' - echo unquarantining Homebrew casks... - PATH="/opt/homebrew/bin:${ - pkgs.lib.makeBinPath [ pkgs.jq pkgs.gnugrep ] - }:/usr/bin:$PATH" \ - sudo \ - --preserve-env=PATH \ - --user=${config.system.primaryUser} \ - --set-home \ - brew info \ - --casks \ - --installed \ - --json=v2 \ - | jq \ - --raw-output0 \ - '.casks[] - | select(.artifacts[] | type == "object" and has("app")) - | "\(.artifacts[]?.app | first // empty)"' \ - | xargs \ - --null \ - -I{} \ - sh -c 'xattr "$0" | \ - grep \ - --quiet \ - com.apple.quarantine \ - && echo "$0" \ - && xattr -vrd com.apple.quarantine "$0" \ - || true' \ - /Applications/{} - ''; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; nixpkgs.hostPlatform = "aarch64-darwin"; @@ -119,14 +79,12 @@ "docker-buildx" "docker-credential-helper" "firefoxpwa" - "mpv" "r" ]; casks = [ "alt-tab" "anki" "anythingllm" - "db-browser-for-sqlite" "firefox" "freetube" "inkscape"