Remove SatoshiPay

7 files changed, 4 insertions, 271 deletions

diff --git a/flake.lock b/flake.lock
index 7cf89d34..25bc2f21 100644
--- a/flake.lock
+++ b/flake.lock
@@ -162,11 +162,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1699292702,
-        "narHash": "sha256-Ug44/XUm0irmZuhvcjMyNXKGZ9Saiyn1nT2qm0hC5hQ=",
+        "lastModified": 1700668056,
+        "narHash": "sha256-xcTTGxV0uzbyTsZqQDhE0u2vF5XAeP1P3dnjIJFuHmI=",
         "ref": "refs/heads/main",
-        "rev": "fec05e116c9b04b91c414f595f93590590c1ce6b",
-        "revCount": 59,
+        "rev": "f4e0f0f6fad0ee875a210eb731a8fb231acf8987",
+        "revCount": 60,
         "type": "git",
         "url": "file:///home/alan/projects/alanpearce.eu/nixfiles/private"
       },
diff --git a/private b/private
-Subproject fec05e116c9b04b91c414f595f93590590c1ce6
+Subproject f4e0f0f6fad0ee875a210eb731a8fb231acf898
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
deleted file mode 100644
index 662d3359..00000000
--- a/system/satoshipad.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ config
-, pkgs
-, ...
-}: {
-  imports = [
-    ./hardware-configuration.nix
-
-    <nixos-hardware/lenovo/thinkpad/t470s>
-    <nixos-hardware/common/pc/ssd>
-    <nixos-hardware/common/cpu/intel/kaby-lake>
-    ./settings/machines/t470s.nix
-
-    ./settings/base.nix
-    ./settings/configuration/berlin.nix
-    ./settings/configuration/british-english.nix
-    ./settings/configuration/nix.nix
-    ./settings/configuration/user.nix
-    ./settings/hardware/nvme-root.nix
-    ./settings/hardware/audio.nix
-    ./settings/hardware/systemd-boot.nix
-    ./settings/hardware/keyboardio-model01.nix
-    ./settings/hardware/network-manager.nix
-    ./settings/hardware/keyboard.nix
-    ./settings/hardware/trackball.nix
-    ./settings/hardware/trezor.nix
-    ./settings/programs/base.nix
-    ./settings/programs/gnupg.nix
-    ./settings/programs/i3.nix
-    ./settings/programs/shell.nix
-    ./settings/satoshipay.nix
-  ];
-
-  services.throttled.enable = true;
-
-  boot.initrd.luks.devices = {
-    root = {
-      allowDiscards = true;
-      device = "/dev/disk/by-uuid/bb7f9a24-8963-4d00-9258-118050b35748";
-      preLVM = true;
-    };
-  };
-
-  networking.hostName = "satoshipad";
-  services.avahi.hostName = "alan-satoshipay";
-
-  xsession.windowManager.i3.config = {
-    assigns = {
-      "1" = [{ class = "^Ripcord$"; }];
-      "3" = [{ class = "^Firefox Developer Edition$"; }];
-      "8" = [{ class = "^Emacs$"; }];
-      "9" = [{ class = "\.exe$"; }];
-      "10" = [{ class = "^Barrier$"; }];
-    };
-  };
-
-  system.stateVersion = "18.03";
-}
diff --git a/system/settings/satoshipay.nix b/system/settings/satoshipay.nix
deleted file mode 100644
index 2f520411..00000000
--- a/system/settings/satoshipay.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config
-, pkgs
-, fetchurl
-, lib
-, ...
-}:
-let
-  dockerConfig = {
-    ipv6 = true;
-    fixed-cidr-v6 = "fd69:2074:9fcd:b0fd::/64";
-    features = {
-      buildkit = true;
-    };
-  };
-in
-{
-  virtualisation = {
-    docker = {
-      enable = true;
-      enableOnBoot = false;
-      liveRestore = false;
-
-      extraOptions = "--config-file=${pkgs.writeText "daemon.json" (builtins.toJSON dockerConfig)}";
-
-      autoPrune = {
-        enable = true;
-        dates = "Mon, 13:00";
-      };
-    };
-  };
-  networking.firewall.extraCommands = ''
-    iptables  -A nixos-fw -p udp --source 172.17.0.0/24         -j nixos-fw-accept
-    iptables  -A nixos-fw -p tcp --source 172.17.0.0/24         -j nixos-fw-accept
-    ip6tables -A nixos-fw -p tcp --source ${dockerConfig.fixed-cidr-v6} -j nixos-fw-accept
-    ip6tables -A nixos-fw -p udp --source ${dockerConfig.fixed-cidr-v6} -j nixos-fw-accept
-  '';
-
-  nix.gc.dates = "12:30";
-  system.autoUpgrade.dates = "13:05";
-}
diff --git a/user/emacs/init.el b/user/emacs/init.el
index b9c14a47..2f82ae9e 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -818,7 +818,6 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   (fringe-helper-define 'flycheck-fringe-bitmap-double-arrow '(center repeated)
     "XXX....."))
 
-(setq gitlab-ci-url "https://gitlab.satoshipay.tech")
 (use-package gitlab-ci-mode-flycheck
   :ghook ('gitlab-ci-mode-hook (list #'gitlab-ci-mode-flycheck-enable
                                      #'flycheck-mode)))
diff --git a/user/satoshipad.nix b/user/satoshipad.nix
deleted file mode 100644
index 946b0390..00000000
--- a/user/satoshipad.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ config
-, pkgs
-, ...
-}: {
-  imports = [
-    ../private
-
-    ./settings/base.nix
-    ./settings/chat.nix
-    ./settings/development/base.nix
-    ./settings/development/javascript.nix
-    ./settings/development/web.nix
-    ./settings/dunst.nix
-    ./settings/emacs.nix
-    ./settings/git.nix
-    ./settings/gnupg.nix
-    ./settings/i3.nix
-    ./settings/mail.nix
-    ./settings/music.nix
-    ./settings/nixos.nix
-    ./settings/rofi.nix
-    ./settings/passwords.nix
-    ./settings/satoshipay.nix
-    ./settings/sxhkd.nix
-    ./settings/tabnine.nix
-    ./settings/trezor.nix
-    ./settings/user-interface.nix
-    ./settings/xresources.nix
-  ];
-
-  home.sessionVariables.EMAIL = "alan@satoshipay.io";
-  home.sessionVariables.BROWSER = "firefox-devedition";
-  programs.tabnine.config.local_enabled = "No";
-
-  xsession.windowManager.i3 = {
-    config = {
-      startup = [
-        { command = "firefox-devedition"; }
-        { command = "ripcord"; }
-        { command = "emacs"; }
-      ];
-    };
-    extraConfig = ''
-      workspace 1 output primary
-      workspace 2 output primary
-      workspace 3 output primary
-      workspace 4 output primary
-      workspace 5 output primary
-      workspace 6 output secondary
-      workspace 7 output secondary
-      workspace 8 output secondary
-      workspace 9 output secondary
-      workspace 10 output secondary
-    '';
-  };
-}
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
deleted file mode 100644
index 558f8791..00000000
--- a/user/settings/satoshipay.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-let
-  inherit (pkgs) stdenv;
-  spGitConfig = {
-    user.email = "alan@satoshipay.io";
-  };
-in
-{
-  imports = [
-    ./development/javascript.nix
-    ./development/web.nix
-  ];
-
-  home.sessionVariables = {
-    KUBECTX_IGNORE_FZF = "1";
-  };
-  home.packages = with pkgs; ([
-    caddy
-    openssl
-    mongodb-tools
-    pgcli
-    pgformatter
-    postgresql
-    s3cmd
-    sops
-
-    lumen
-
-    mkcert
-    google-cloud-sdk
-    doctl
-    kubectl
-    kubetail
-    kubectx
-    kubernetes-helm
-    helmfile
-  ]
-  ++ (lib.optionals (!stdenv.isDarwin)
-    [
-      docker-compose
-
-      ripcord
-      robo3t
-    ]));
-  programs.emacs.extraPackages = epkgs: (with epkgs; [
-    gitlab-ci-mode
-    gitlab-ci-mode-flycheck
-    k8s-mode
-    kubel
-    kubel-evil
-  ] ++ lib.optionals (!stdenv.isDarwin) [
-    pkgs.mu
-  ]);
-
-  programs.git.includes = [
-    {
-      condition = "gitdir:~/projects/github.com/satoshipay/";
-      contents = spGitConfig;
-    }
-    {
-      condition = "gitdir:~/projects/gitlab.satoshipay.tech/";
-      contents = spGitConfig;
-    }
-  ];
-
-  home.shellAliases = {
-    kns = "kubens";
-    kx = "kubectx";
-    ks = "echo $(kubectx -c):$(kubens -c)";
-    klot = "kubetail";
-  };
-
-  accounts.email.accounts.satoshipay =
-    let
-      address = "alan@satoshipay.io";
-    in
-    {
-      inherit address;
-      primary = lib.mkDefault true;
-      realName = "Alan Pearce";
-      flavor = "gmail.com";
-      passwordCommand = "${pkgs.python3Packages.keyring}/bin/keyring get satoshipay-google-mail ${address}";
-      folders = {
-        inbox = "INBOX";
-        drafts = "[Gmail]/Drafts";
-        sent = "[Gmail]/Sent Mail";
-        trash = "[Gmail]/Bin";
-      };
-      imap = {
-        tls.enable = true;
-      };
-      smtp = {
-        tls.enable = true;
-      };
-      mbsync = {
-        enable = true;
-        create = "maildir";
-        remove = "maildir";
-        expunge = "both";
-      };
-      msmtp = {
-        enable = true;
-      };
-    };
-
-  xdg.configFile."npm/config".text = ''
-    @satoshipay:registry=https://registry.npmjs.org/
-  '';
-}