debloat

class/desktop/clipboard.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = [pkgs.wl-clipboard];
+}

class/desktop/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./clipboard.nix
     ./flatpak.nix
     ./fonts.nix
     ./fs.nix

class/desktop/neovide.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: let
   package = pkgs.neovide;
 in {
-  environment.systemPackages = [package pkgs.wl-clipboard];
+  environment.systemPackages = [package];
 }

common/atuin.nix

@@ -1,13 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  package = pkgs.atuin;
-in {
-  environment.systemPackages = [package];
-
-  programs.bash.interactiveShellInit = ''
-    eval "$(${lib.getExe package} init bash)"
-  '';
-}

common/bash.nix

@@ -1,18 +1,5 @@
 {
-  programs = {
-    command-not-found.enable = false;
-
-    bash = {
-      blesh.enable = true;
-
-      interactiveShellInit = ''
-        shopt -s globstar
-        shopt -s nullglob
-        shopt -s extglob
-        shopt -s checkwinsize
-
-        bind 'set show-mode-in-prompt off'
+  programs.bash. interactiveShellInit = ''
+    shopt -s autocd globstar failglob extglob checkwinsize
   '';
-    };
-  };
 }

common/cnf.nix

@@ -0,0 +1,3 @@
+{
+  programs.command-not-found.enable = false;
+}

common/default.nix

@@ -1,8 +1,8 @@
 {
   imports = [
-    ./atuin.nix
-    ./avahi.nix
     ./bash.nix
+    ./cnf.nix
+    ./fish.nix
     ./boot.nix
     ./bottom.nix
     ./dbus.nix

common/direnv.nix

@@ -1,11 +1,3 @@
 {
-  config,
-  lib,
-  ...
-}: {
   programs.direnv.enable = true;
-
-  programs.bash.interactiveShellInit = ''
-    eval "$(${lib.getExe config.programs.direnv.package} hook bash)"
-  '';
 }

common/fish.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  programs.fish.enable = true;
+
+  users.defaultUserShell = pkgs.fish;
+}

hosts/abacus/atuin.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  services = {
-    postgresql = {
-      enable = lib.mkDefault true;
-
-      ensureDatabases = ["atuin"];
-      ensureUsers = [
-        {
-          name = "atuin";
-          ensureDBOwnership = true;
-        }
-      ];
-    };
-
-    atuin = {
-      enable = true;
-      openRegistration = false;
-      database.uri = "postgresql:///atuin?host=/run/postgresql&user=atuin";
-    };
-
-    nginx.virtualHosts."atuin.${config.networking.domain}" = {
-      enableACME = true;
-      forceSSL = true;
-      quic = true;
-
-      locations."/".proxyPass = "http://${config.services.atuin.host}:${builtins.toString config.services.atuin.port}";
-    };
-  };
-}

hosts/abacus/default.nix

@@ -2,10 +2,6 @@
   imports = [
     "${modulesPath}/profiles/qemu-guest.nix"
 
-    ./atuin.nix
-    ./conduit.nix
-    ./forgejo.nix
-    ./navidrome.nix
     ./nginx.nix
     ./vaultwarden.nix
   ];

hosts/abacus/forgejo.nix

@@ -1,44 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  virtualHostName = "tea.${config.networking.domain}";
-in {
-  services.forgejo = {
-    enable = true;
-
-    database.type = "postgres";
-
-    lfs.enable = true;
-
-    settings = {
-      session = {
-        COOKIE_SECURE = true;
-        PROVIDER = "db";
-      };
-
-      service = {
-        DISABLE_REGISTRATION = true;
-      };
-
-      server = {
-        PROTOCOL = "http";
-        HTTP_ADDR = "127.0.0.1";
-        HTTP_PORT = 8020;
-        DOMAIN = virtualHostName;
-        ROOT_URL = "https://${virtualHostName}/";
-      };
-    };
-  };
-
-  services.nginx.virtualHosts.${virtualHostName} = {
-    enableACME = true;
-    forceSSL = true;
-    quic = true;
-
-    locations."/".proxyPass = "http://${config.services.forgejo.settings.server.HTTP_ADDR}:${builtins.toString config.services.forgejo.settings.server.HTTP_PORT}";
-  };
-
-  environment.systemPackages = [pkgs.forgejo];
-}

hosts/abacus/navidrome.nix

@@ -1,24 +0,0 @@
-{config, ...}: {
-  services.navidrome = {
-    enable = true;
-    settings = {
-      Address = "127.0.0.1";
-      Port = 8030;
-      MusicFolder = "/srv/music";
-    };
-  };
-
-  services.nginx.virtualHosts."navi.${config.networking.domain}" = {
-    enableACME = true;
-    forceSSL = true;
-    quic = true;
-
-    locations."/".proxyPass = "http://${config.services.navidrome.settings.Address}:${builtins.toString config.services.navidrome.settings.Port}";
-  };
-
-  fileSystems.${config.services.navidrome.settings.MusicFolder} = {
-    device = "/dev/disk/by-label/music";
-    fsType = "btrfs";
-    options = ["compress=zstd" "noatime"];
-  };
-}