Commit 6240918

bryfry <bryon.fryer@gmail.com>
2022-11-13 19:41:36
doom and min.yml
master
1 parent 9a9a435
Changed files (5)
roles
doom
tasks
main.yml
home
tasks
main.yml
main.yml
min.yml
vars.yml
roles/doom/tasks/main.yml
@@ -22,7 +22,7 @@
     depth: 1
 
 - name: doom install
-  command: "{{ ansible_env.HOME }}/.emacs.d/bin/doom install --no-fonts"
+  command: "{{ ansible_env.HOME }}/.emacs.d/bin/doom install --no-fonts --env --install --force" 
 
 - name: doom sync
   command: "{{ ansible_env.HOME }}/.emacs.d/bin/doom sync"
@@ -30,6 +30,9 @@
 - name: doom doctor
   command: "{{ ansible_env.HOME }}/.emacs.d/bin/doom doctor"
 
+- name: doom build
+  command: "{{ ansible_env.HOME }}/.emacs.d/bin/doom build"
+
 - name: bundle doom up
   archive:
     path:
roles/home/tasks/main.yml
@@ -70,3 +70,5 @@
       dest: "$HOME/.doom.d/init.el"
     - src: "{{ home_repo }}/doom/packages.el"
       dest: "$HOME/.doom.d/packages.el"
+    - src: "{{ home_repo }}/doom/custom.el"
+      dest: "$HOME/.doom.d/custom.el"
main.yml
@@ -1,93 +1,15 @@
 ---
 - hosts: localhost
  
-  vars:
-    apt_pkgs:
-     - tmux 
-     - htop
-     - curl
-     - haveged # helps random number generation on small vms
-     - software-properties-common # needed for ppa add repo
-     - dirmngr   # needed for ppa add-key
-     - gpg-agent # needed for ppa add-key
-     - nmap 
-     - jq
-     - tree
-     - gnupg
-     - python3-venv
-     - figlet
-     - elinks
-     - wireguard
-     - zip
-     - vim
-     - j2cli
-     # emacs (doom)
-     - emacs-nox
-     - git
-     - ripgrep
-     - fd-find
-     - python3-pip
-     - gopls
-
-    apt_keys:
-    # github cli key id
-    # https://github.com/cli/cli/blob/trunk/docs/install_linux.md#debian-ubuntu-linux-raspberry-pi-os-apt
-     - keyserver: "keyserver.ubuntu.com"
-       id: "23F3D4EA75716059" 
-
-    apt_ppas:
-     - "deb https://cli.github.com/packages stable main"
-
-    apt_ppa_pkgs:
-     - gh
-
-    traefik:
-      version: 2.8.0
-      checksum: sha256:8c570f09684db0a34e52dc2894c1312b7510daa6f86db8bbc4641e8698b381b8
-      acme_http_resolver: "tmc-acme-http"
-      domain: "trustme.click"
-      arch: "arm64"
-      dirs:
-        log: "/var/log/traefik"
-        config: "/etc/traefik"
-        certs: "/etc/traefik/certs"
-        dynamic_config: "/etc/traefik/traefik.d"
-        install: "/opt/traefik"
-     
-    # mirror-mirror
-    mm:
-      subdomain: "ip"
-      address: 127.0.0.1
-      port: 28103 # = 0x6d6d = mm (ascii)
-      arch: "arm64"
-    alias:
-      subdomain: "alias"
-      address: 127.0.0.1
-      port: 28104
-    proxy:
-      subdomain: "proxy"
-      address: 127.0.0.1
-      port: 8080
-    srs:
-      subdomain: "srs"
-      address: 127.0.0.1
-      port: 8001
-
-    # doom
-    nodejs_version: 16.18.0
+  vars_files:
+    - vars.yml
       
-    
-
   gather_facts: True
 
   roles: 
    - apt
    - home # git checkouts too
-     #- traefik
-     #- mirror-mirror
-     #- alias
+   - traefik
+   - mirror-mirror
+   - alias
    - doom
- 
-  #TODO
-  # wg genkey | sudo tee /etc/wireguard/tmc_privatekey | wg pubkey | sudo tee /etc/wireguard/tmc_publickey
-  # make 443 udp iptables forward to wireguard port
min.yml
@@ -0,0 +1,13 @@
+---
+- name: Minimal install (doom+apt)
+  hosts: localhost
+ 
+  vars_files:
+    - vars.yml
+      
+  gather_facts: True
+
+  roles: 
+   - apt
+   - home # git checkouts too
+   - doom
vars.yml
@@ -0,0 +1,74 @@
+---
+apt_pkgs:
+ - tmux 
+ - htop
+ - curl
+ - haveged # helps random number generation on small vms
+ - software-properties-common # needed for ppa add repo
+ - dirmngr   # needed for ppa add-key
+ - gpg-agent # needed for ppa add-key
+ - nmap 
+ - jq
+ - tree
+ - gnupg
+ - python3-venv
+ - figlet
+ - elinks
+ - wireguard
+ - zip
+ - vim
+ - j2cli
+ # emacs (doom)
+ - emacs-nox
+ - git
+ - ripgrep
+ - fd-find
+ - python3-pip
+ - gopls
+
+apt_keys:
+# github cli key id
+# https://github.com/cli/cli/blob/trunk/docs/install_linux.md#debian-ubuntu-linux-raspberry-pi-os-apt
+ - keyserver: "keyserver.ubuntu.com"
+   id: "23F3D4EA75716059" 
+
+apt_ppas:
+ - "deb https://cli.github.com/packages stable main"
+
+apt_ppa_pkgs:
+ - gh
+
+traefik:
+  version: 2.8.0
+  checksum: sha256:8c570f09684db0a34e52dc2894c1312b7510daa6f86db8bbc4641e8698b381b8
+  acme_http_resolver: "tmc-acme-http"
+  domain: "trustme.click"
+  arch: "arm64"
+  dirs:
+    log: "/var/log/traefik"
+    config: "/etc/traefik"
+    certs: "/etc/traefik/certs"
+    dynamic_config: "/etc/traefik/traefik.d"
+    install: "/opt/traefik"
+ 
+# mirror-mirror
+mm:
+  subdomain: "ip"
+  address: 127.0.0.1
+  port: 28103 # = 0x6d6d = mm (ascii)
+  arch: "arm64"
+alias:
+  subdomain: "alias"
+  address: 127.0.0.1
+  port: 28104
+proxy:
+  subdomain: "proxy"
+  address: 127.0.0.1
+  port: 8080
+srs:
+  subdomain: "srs"
+  address: 127.0.0.1
+  port: 8001
+
+# doom
+nodejs_version: 16.18.0