diff options
author | Griffin Smith <root@gws.fyi> | 2020-05-07T14·56-0400 |
---|---|---|
committer | Griffin Smith <root@gws.fyi> | 2020-05-07T14·56-0400 |
commit | c6963f8cb5a7995d889c6aacfd5e13510c63844c (patch) | |
tree | 48819e5c54dc0f4ac23ed0e5bb831d58f5e08979 | |
parent | 1316d4fccd3e946813b824d04b7d277da6e753aa (diff) |
dogfood urbos
-rw-r--r-- | home/home.nix | 4 | ||||
-rw-r--r-- | home/modules/urbint/backend.nix | 22 | ||||
-rw-r--r-- | home/modules/urbint/common.nix | 79 | ||||
-rw-r--r-- | home/modules/urbint/default.nix | 8 | ||||
-rw-r--r-- | home/modules/urbint/frontend.nix | 14 | ||||
-rw-r--r-- | system/modules/common.nix | 2 | ||||
-rw-r--r-- | system/modules/urbint.nix | 18 |
7 files changed, 2 insertions, 145 deletions
diff --git a/home/home.nix b/home/home.nix index af289c8d0bcf..1a4d6e50de9a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -14,9 +14,7 @@ let machine = ./machines/chupacabra.nix; in ./modules/tarsnap.nix ./modules/vim.nix - ./modules/lib/cloneRepo.nix - - ./modules/urbint + ~/code/urb/urbos/home machine ]; diff --git a/home/modules/urbint/backend.nix b/home/modules/urbint/backend.nix deleted file mode 100644 index ed8a3a3e7a76..000000000000 --- a/home/modules/urbint/backend.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./common.nix - ]; - - home.packages = with pkgs; [ - cloud-sql-proxy - postgresql - jupyter - python3Packages.jupyter_core - redis - ngrok-2 - ]; - - home.file.".ipython/profile_default/ipython_config.py".text = '' - c.InteractiveShellApp.exec_lines = ['%autoreload 2'] - c.InteractiveShellApp.extensions = ['autoreload'] - c.TerminalInteractiveShell.editing_mode = 'vi' - ''; -} diff --git a/home/modules/urbint/common.nix b/home/modules/urbint/common.nix deleted file mode 100644 index 52db4c66629b..000000000000 --- a/home/modules/urbint/common.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - aliases = { - cluster = "gcloud container clusters get-credentials"; - vpon = "sudo systemctl start openvpn-urbint.service"; - }; -in -{ - imports = [ ../lib/cloneRepo.nix ]; - - options = { - urbint.projectPath = mkOption { - description = '' - Root path to clone Urbint repos in, relative to your home directory - ''; - type = types.str; - default = "code"; - }; - }; - - config = { - services.lorri.enable = true; - - programs.direnv = { - enable = true; - enableBashIntegration = true; - enableZshIntegration = true; - }; - - home.packages = with pkgs; [ - docker - docker-compose - skopeo - - kubectl - kubetail - google-cloud-sdk - openvpn - sops - (import <nixpkgs-unstable> {}).argocd - drone-cli - - git - - zoom-us - slack - _1password - ]; - - nixpkgs.config.allowUnfree = true; - - impure.clonedRepos = { - grid = { - github = "urbint/grid"; - path = "${config.urbint.projectPath}/grid"; - }; - - docker-images = { - github = "urbint/docker-images"; - path = "${config.urbint.projectPath}/docker-images"; - }; - - gitops = { - github = "urbint/gitops"; - path = "${config.urbint.projectPath}/gitops"; - }; - }; - - programs.zsh.shellAliases = aliases; - programs.bash.shellAliases = aliases; - - programs.zsh.envExtra = '' - export DRONE_SERVER=https://ci.urbinternal.com - ''; - }; -} diff --git a/home/modules/urbint/default.nix b/home/modules/urbint/default.nix deleted file mode 100644 index fac57acff701..000000000000 --- a/home/modules/urbint/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./frontend.nix - ./backend.nix - ]; -} diff --git a/home/modules/urbint/frontend.nix b/home/modules/urbint/frontend.nix deleted file mode 100644 index 543e9eebc057..000000000000 --- a/home/modules/urbint/frontend.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./common.nix - ]; - - home.packages = with pkgs; [ - yarn - nodejs - clojure - nodePackages.prettier - ]; -} diff --git a/system/modules/common.nix b/system/modules/common.nix index 3f5023793d0e..d172ff4a45a3 100644 --- a/system/modules/common.nix +++ b/system/modules/common.nix @@ -7,8 +7,8 @@ ./fonts.nix ./emacs.nix ./sound.nix - ./urbint.nix ./kernel.nix + /home/grfn/code/urb/urbos/system ]; boot.loader.systemd-boot.enable = true; diff --git a/system/modules/urbint.nix b/system/modules/urbint.nix deleted file mode 100644 index 4b05175756bc..000000000000 --- a/system/modules/urbint.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: -{ - virtualisation.docker.enable = true; - - nix = rec { - binaryCaches = [ "https://nix.urbinternal.com" ]; - trustedBinaryCaches = binaryCaches; - trustedUsers = [ "griffin" ]; - requireSignedBinaryCaches = false; - }; - - services.openvpn.servers.urbint = { - config = '' - config /root/openvpn/urbint.conf - ''; - autoStart = false; - }; -} |