Install docker repos

playbooks/apt.yaml

@@ -14,6 +14,7 @@
         install_recommends: true
         pkg:
           - ansible
+          - composer
           - curl
           - dia
           - fcitx5
@@ -28,6 +29,7 @@
           - network-manager-gnome
           - network-manager-config-connectivity-debian
           - nextcloud-desktop
+          - nodejs
           - npm
           - pass
           - pavucontrol
@@ -37,6 +39,7 @@
           - pkexec
           - puppet-lint
           - python3-yamlfix
+          - rsync
           - scdaemon
           - sway
           - sway-backgrounds

playbooks/nvim.yaml

@@ -4,7 +4,7 @@
   vars:
     uid: "{{ lookup('env','USER') }}"
     LV_BRANCH: release-1.3/neovim-0.9
-    tabby_password: "{{ lookup('ansible.builtin.pipe','pass show tabby-lab.sunet.se/tabby') }}"
+    tabby_token: "{{ lookup('ansible.builtin.pipe','pass show tabby-lab.sunet.se/tabby-token') }}"
   connection: local
   become: false
   tasks:
@@ -80,14 +80,10 @@
         owner: '{{ uid }}'
         group: '{{ uid }}'
         mode: '0644'
-    - name: Create sources dir
-      ansible.builtin.file:
-        dest: /home/{{ uid }}/sources
-        state: directory
-      when: not have_nvim.stat.exists
-    - name: Get tabby plugin
-      ansible.builtin.command:
-        chdir: /home/{{ uid }}/sources/
-        cmd: git clone https://github.com/TabbyML/tabby.git
-        creates: /home/{{ uid }}/sources/tabby
-      when: not have_nvim.stat.exists
+    - name: Install tabby config
+      ansible.builtin.template:
+        src: ../templates/config.toml.j2
+        dest: /home/{{ uid }}/.tabby-client/agent/config.toml
+        owner: '{{ uid }}'
+        group: '{{ uid }}'
+        mode: '0644'

playbooks/sunet.yaml

@@ -17,7 +17,10 @@
       - puppet-sunet
     platformrepos:
       - sunetdrive
-
+    dockerrepos:
+      - nextcloud-custom
+      - dovecot-lda-docker
+      - postfix-docker
   connection: local
   become: false
   tasks:
@@ -41,6 +44,12 @@
         cmd: git clone {{ github }}/{{ item }}
         creates: /home/{{ uid }}/sunet/puppet/{{ item }}
       loop: "{{ puppetrepos }}"
+    - name: Get github docker-repos 
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sunet/docker
+        cmd: git clone {{ github }}/{{ item }}
+        creates: /home/{{ uid }}/sunet/docker/{{ item }}
+      loop: "{{ dockerrepos }}"
     - name: Get platform puppet-repos 
       ansible.builtin.command:
         chdir: /home/{{ uid }}/sunet/puppet

templates/config.lua.j2

@@ -128,8 +128,8 @@ formatters.setup {
 lvim.plugins = {
   {
     "rodjek/vim-puppet",
-    'tpope/vim-surround',
-    { 'tabbyml/tabby', name = 'tabby', dir = '~/sources/tabby/clients/vim', enabled = true },
+    "tpope/vim-surround",
+    "TabbyML/vim-tabby",
   },
 }
 
@@ -151,8 +151,6 @@ vim.api.nvim_create_autocmd("BufReadPost", {
 -- })
 
 
-vim.g.tabby_server_url = 'https://tabby:{{ tabby_password }}@tabby-lab.sunet.se'
--- vim.g.tabby_server_url = 'https://tabby-test.sunet.se'
-vim.g.tabby_accept_binding = '<C-Right>'
-vim.g.tabby_dismiss_binding = '<C-Left>'
+vim.g.tabby_keybinding_accept = '<C-Right>'
+vim.g.tabby_keybinding_trigger_or_dismiss = '<C-Left>'
 vim.g.tabby_suggestion_delay = 100

templates/config.toml.j2

@@ -0,0 +1,28 @@
+## Tabby agent configuration file
+
+## You can uncomment any block to enable settings.
+## Configurations in this file has lower priority than in IDE settings.
+
+## Server
+## You can set the server endpoint here.
+# [server]
+# endpoint = "http://localhost:8080" # http or https URL
+
+## You can add custom request headers, e.g. for authentication.
+# [server.requestHeaders]
+# Authorization = "Bearer eyJhbGciOiJ..........."
+
+## Logs
+## You can set the log level here. The log file is located at ~/.tabby-client/agent/logs/.
+# [logs]
+# level = "silent" # or "error" or "debug"
+
+## Anonymous usage tracking
+## You can disable anonymous usage tracking here.
+# [anonymousUsageTracking]
+# disable = false # set to true to disable
+
+[server]
+endpoint = "https://tabby-lab.sunet.se:443"
+[server.requestHeaders]
+Authorization = "Basic {{ tabby_token }}"