homes/common.nix

@@ -46,8 +46,6 @@ in {
       micromamba
       most
       nextflow
-      p7zip
-      pdfgrep
       pipx
       python3
       zulu17

homes/desktop.nix

@@ -2,7 +2,6 @@
 
   imports = [
     ./../programs/firefox.nix
-    ./../programs/ghostty.nix
     ./../programs/zed.nix
     ./../services/gpg-agent.nix
   ];

playbook.yaml

@@ -179,7 +179,6 @@
         name:
           - chromium
           - firefoxpwa
-          - ghostty
           - inkscape
           - kate
           - kdenlive
@@ -259,7 +258,6 @@
           - com.logseq.Logseq
           - io.freetubeapp.FreeTube
           - io.github.alainm23.planify
-          - io.github.dweymouth.supersonic
           - io.openrct2.OpenRCT2
           - org.zulip.Zulip
           - net.ankiweb.Anki

programs/ghostty.nix

@@ -1,17 +0,0 @@
-{ ... }: {
-  programs.ghostty = {
-    enable = true;
-    package = null;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    settings = {
-      quick-terminal-position = "top";
-      quick-terminal-screen = "main";
-      quick-terminal-autohide = true;
-      quick-terminal-size = "50%,50%";
-      keybind = "global:cmd+backquote=toggle_quick_terminal";
-      macos-hidden = "always";
-      linux-cgroup = "always";
-    };
-  };
-}

services/nixos-update.nix

@@ -2,21 +2,35 @@
 { pkgs, ... }:
 
 {
-  environment.systemPackages = [
+  environment.systemPackages = with pkgs;
-    (pkgs.writeScriptBin "update-nixos" ''
+    [
-      #!${pkgs.bash}/bin/bash
+      (pkgs.writeScriptBin "update-nixos" ''
-      echo "Requesting system update..."
+        #!${pkgs.bash}/bin/bash
-      ${pkgs.systemd}/bin/systemctl start nixos-update.service
+        echo "Requesting system update..."
-    '')
+        ${pkgs.systemd}/bin/systemctl start nixos-update.service
-  ];
+      '')
+    ];
 
   # Service to update NixOS configuration from git repo
   systemd.services."nixos-update" = {
     description = "Update NixOS configuration from git repository";
-    path = with pkgs; [ coreutils ];
+    path = with pkgs; [ git coreutils ];
     script = ''
-      # Rebuild the system directly from the remote flake
+      # Ensure the directory exists
-      ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake git+https://code.millironx.com/millironx/nix-dotfiles.git#bosephus
+      mkdir -p /srv/config
+
+      # Clone/pull the repository
+      if [ -d "/srv/config/.git" ]; then
+        cd /srv/config
+        git fetch origin
+        git reset --hard origin/master
+      else
+        rm -rf /srv/config
+        git clone https://code.millironx.com/millironx/nix-dotfiles.git /srv/config
+      fi
+
+      # Rebuild the system
+      ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /srv/config#bosephus
     '';
     serviceConfig = {
       Type = "oneshot";

systems/darwin/corianne.nix

@@ -33,59 +33,6 @@
   system.keyboard.enableKeyMapping = true;
   system.primaryUser = "millironx";
 
-  system.defaults.dock = {
-    autohide = false;
-    minimize-to-application = true;
-    mru-spaces = false;
-    persistent-apps = let
-      dedupDotApp = appName:
-        if pkgs.lib.strings.hasSuffix ".app" appName then
-          appName
-        else
-          appName + ".app";
-      macAppPath = { location, name }: "${location}/${dedupDotApp name}";
-      sysApp = appName: {
-        app = macAppPath {
-          location = "/Applications";
-          name = appName;
-        };
-      };
-      chromeApp = appName: {
-        app = macAppPath {
-          location = "/Users/millironx/Applications/Chromium Apps.localized";
-          name = appName;
-        };
-      };
-      localApp = appName: {
-        app = macAppPath {
-          location = "/Users/millironx/Applications";
-          name = appName;
-        };
-      };
-    in [
-      (sysApp "Firefox")
-      (chromeApp "Messages")
-      (sysApp "Signal")
-      (sysApp "Thunderbird")
-      (sysApp "Immich")
-      (sysApp "Logseq")
-      (sysApp "Zed")
-      (sysApp "Steam")
-      (sysApp "Amperfy")
-      (sysApp "Microsoft Word")
-      (sysApp "Microsoft Excel")
-      (sysApp "Microsoft PowerPoint")
-      (localApp "Canvas")
-      (sysApp "Zotero")
-      (localApp "VetPrep")
-      (chromeApp "Instinct Dashboard")
-      (chromeApp "Carestream")
-    ];
-    show-process-indicators = true;
-    show-recents = false;
-    tilesize = 48;
-  };
-
   # 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
@@ -180,10 +127,8 @@
       "anki"
       "anythingllm"
       "db-browser-for-sqlite"
-      "dolphin"
       "firefox"
       "freetube"
-      "ghostty"
       "inkscape"
       "iterm2"
       "logi-options+"
@@ -195,7 +140,6 @@
       "openrct2"
       "porting-kit"
       "qownnotes"
-      "qt-creator"
       "rstudio"
       "signal"
       "slack"
@@ -213,7 +157,6 @@
       "zulip"
     ];
     masApps = {
-      "Amperfy Music" = 1530145038;
       "Bitwarden" = 1352778147;
       "Tailscale" = 1475387142;
     };

systems/linux/bosephus.nix

@@ -11,7 +11,6 @@
     ./../../services/nixos-update.nix
     ./../../services/samba.nix
     ./../../services/pihole.nix
-    ./../../services/galaxy.nix
   ];
 
   # Bootloader.
@@ -94,40 +93,11 @@
 
   programs.zsh.enable = true;
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ neovim git borgbackup ];
-    neovim
-    git
-    borgbackup
-    # Galaxy dependencies
-    python3
-    python3Packages.virtualenv
-    python3Packages.pip
-    python3Packages.setuptools
-    python3Packages.wheel
-    nodejs
-    which
-    procps
-    gcc
-    gnumake
-  ];
 
   services = {
     openssh.enable = true;
     tailscale.enable = true;
-    galaxy = {
-      enable = true;
-      host = "0.0.0.0"; # Allow external connections
-      port = 8080;
-      dataDir = "/var/lib/galaxy";
-      user = "galaxy";
-      group = "galaxy";
-    };
-  };
-
-  # Virtual memory settings for Galaxy
-  boot.kernel.sysctl = {
-    "vm.swappiness" = 10;
-    "vm.min_free_kbytes" = 65536;
   };
 
   system.stateVersion = "25.05"; # Did you read the comment?