flake.nix

@@ -259,7 +259,6 @@
             notifications = "ntfy.${baseName}";
             prometheus = "prom.${baseName}";
             paperless = "paper.${baseName}";
-            photos = "photos.${baseName}";
             secrets = "vault.${baseName}";
             stream = "stream.${baseName}";
             content = "cloud.${baseName}";

hosts/swan/default.nix

@@ -109,7 +109,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
       services.audiobookshelf.enable = true;
       services.bind.enable = true;
       services.caddy.enable = true;
-      services.immich.enable = true;
       services.jellyfin.enable = true;
       services.nextcloud.enable = true;
       services.calibre-web.enable = true;

modules/common/default.nix

@@ -101,10 +101,6 @@
         type = lib.types.str;
         description = "Hostname for document server (paperless-ngx).";
       };
-      photos = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for photo management (Immich).";
-      };
       prometheus = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for Prometheus server.";

modules/common/shell/github.nix

@@ -6,8 +6,6 @@
 }:
 {
 
-  unfreePackages = [ "gh-copilot" ];
-
   home-manager.users.${config.user} = {
 
     programs.gh = lib.mkIf config.home-manager.users.${config.user}.programs.git.enable {
@@ -17,7 +15,6 @@
       extensions = [
         pkgs.gh-collaborators
         pkgs.gh-dash
-        pkgs.gh-copilot
       ];
     };
 

modules/common/shell/nixpkgs.nix

@@ -16,9 +16,7 @@
         nps = "nix repl --expr 'import <nixpkgs>{}'";
         nixo = "man configuration.nix";
         nixh = "man home-configuration.nix";
-        nr = {
-          function = "rebuild-nixos";
-        };
+        nr = "rebuild-nixos";
         nro = "rebuild-nixos offline";
         hm = "rebuild-home";
       };
@@ -45,16 +43,18 @@
         rebuild-nixos = {
           body = ''
             if test "$argv[1]" = "offline"
-                set option "--option substitute false "
+                set option "--option substitute false"
             end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            echo "doas nixos-rebuild switch $option--flake ${config.dotfilesPath}#${config.networking.hostName}"
+            commandline -r "doas nixos-rebuild switch $option --flake ${config.dotfilesPath}#${config.networking.hostName}"
+            commandline --function execute
           '';
         };
         rebuild-home = {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            echo "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
+            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
+            commandline --function execute
           '';
         };
       };

modules/darwin/nixpkgs.nix

@@ -10,9 +10,7 @@
 
     programs.fish = {
       shellAbbrs = {
-        nr = {
-          function = lib.mkForce "rebuild-darwin";
-        };
+        nr = lib.mkForce "rebuild-darwin";
         nro = lib.mkForce "rebuild-darwin offline";
       };
       functions = {
@@ -22,13 +20,15 @@
                 set option "--option substitute false"
             end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            echo "darwin-rebuild switch $option--flake ${config.dotfilesPath}#lookingglass"
+            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#lookingglass"
+            commandline --function execute
           '';
         };
         rebuild-home = lib.mkForce {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            echo "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
+            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
+            commandline --function execute
           '';
         };
       };

modules/nixos/services/default.nix

@@ -15,7 +15,6 @@
     ./cloudflare.nix
     ./filebrowser.nix
     ./identity.nix
-    ./immich.nix
     ./irc.nix
     ./gitea-runner.nix
     ./gitea.nix

modules/nixos/services/immich.nix

@@ -1,42 +0,0 @@
-{ config, lib, ... }:
-
-{
-
-  config = lib.mkIf config.services.immich.enable {
-
-    services.immich = {
-      port = 2283;
-      group = "shared";
-      database.enable = true;
-      redis.enable = true;
-      machine-learning.enable = true;
-      machine-learning.environment = { };
-      mediaLocation = "/data/images";
-      secretsFile = null;
-      settings.server.externalDomain = "https://${config.hostnames.photos}";
-      environment = {
-        IMMICH_ENV = "production";
-        IMMICH_LOG_LEVEL = "log";
-        NO_COLOR = "false";
-        IMMICH_TRUSTED_PROXIES = "127.0.0.1";
-      };
-    };
-
-    caddy.routes = [
-      {
-        match = [ { host = [ config.hostnames.photos ]; } ];
-        handle = [
-          {
-            handler = "reverse_proxy";
-            upstreams = [ { dial = "localhost:${builtins.toString config.services.immich.port}"; } ];
-          }
-        ];
-      }
-    ];
-
-    # Configure Cloudflare DNS to point to this machine
-    services.cloudflare-dyndns.domains = [ config.hostnames.photos ];
-
-  };
-
-}

modules/nixos/system/default.nix

@@ -10,7 +10,6 @@
     ./auto-upgrade.nix
     ./doas.nix
     ./journald.nix
-    ./shared.nix
     ./user.nix
     ./timezone.nix
   ];

modules/nixos/system/shared.nix

@@ -1,14 +0,0 @@
-{ config, lib, ... }:
-{
-
-  config = lib.mkIf config.server {
-
-    # Create a shared group for many services
-    users.groups.shared = { };
-
-    # Give the human user access to the shared group
-    users.users.${config.user}.extraGroups = [ config.users.groups.shared.name ];
-
-  };
-
-}