From 64fde680382d8ed02bd37a602c91b70867334761 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Fri, 4 Jun 2021 22:10:04 +0200
Subject: [PATCH] Update configuration & remove old packages

---
 playbook.yml                             | 11 +----------
 templates/pyproject.j2                   | 20 --------------------
 vars/{archlinux.yml => archlinux-na.yml} |  1 -
 vars/main.yml                            |  5 -----
 vars/ubuntu-focal.yml                    |  1 -
 5 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 templates/pyproject.j2
 rename vars/{archlinux.yml => archlinux-na.yml} (92%)

diff --git a/playbook.yml b/playbook.yml
index b634565..4c71b78 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -1,14 +1,5 @@
 - hosts: localhost
   pre_tasks:
-    - name: load OS specific vars
-      include_vars: '{{ item }}'
-      with_first_found:
-        - files:
-            - '{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}.yml'
-            - '{{ ansible_distribution|lower }}.yml'
-            - '{{ ansible_os_family|lower }}.yml'
-          paths:
-            - 'vars/'
     - name: install packages
       become: true
       package:
@@ -32,6 +23,6 @@
         name: common
         tasks_from: 'poetry.yml'
     - import_tasks: 'tasks/dotfiles.yml'
-    - import_tasks: 'tasks/coc.yml'
   vars_files:
     - 'vars/main.yml'
+    - 'vars/{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}.yml'
diff --git a/templates/pyproject.j2 b/templates/pyproject.j2
deleted file mode 100644
index 5f621ce..0000000
--- a/templates/pyproject.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
-
-[tool.poetry]
-name = "coc"
-version = "0.1.0"
-description = ""
-authors = ["Sonny Bakker <sonny871@hotmail.com>"]
-
-[tool.poetry.dependencies]
-python = "^3.7"
-black = "^19.10b0"
-pylint = "^2.5.3"
-autoflake = "^1.3.1"
-neovim = "^0.3.1"
-
-[tool.poetry.dev-dependencies]
-
-[build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
diff --git a/vars/archlinux.yml b/vars/archlinux-na.yml
similarity index 92%
rename from vars/archlinux.yml
rename to vars/archlinux-na.yml
index b9f65d5..f29d826 100644
--- a/vars/archlinux.yml
+++ b/vars/archlinux-na.yml
@@ -6,7 +6,6 @@ packages:
   - neovim
   - npm
   - ctags
-  - kitty
   - docker
   - docker-compose
   - ttf-ibm-plex
diff --git a/vars/main.yml b/vars/main.yml
index 3dfd4f2..c46593b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -15,10 +15,5 @@ vim_plugins:
   - { url: 'https://github.com/sheerun/vim-polyglot', name: 'vim-polygot' }
   - { url: 'https://github.com/arzg/vim-colors-xcode.git', name: 'vim-colors-xcode' }
 
-poetry_packages:
-  - black
-  - pylint
-  - autoflake
-
 gitlab_domain: 'git.fudiggity.nl'
 gitlab_host_key: 'git.fudiggity.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNmvcxza79T7JZMkifmquwXH/kMUqDnKs9Oob+JrRvn'
diff --git a/vars/ubuntu-focal.yml b/vars/ubuntu-focal.yml
index 36fdb61..f89c36f 100644
--- a/vars/ubuntu-focal.yml
+++ b/vars/ubuntu-focal.yml
@@ -12,5 +12,4 @@ packages:
   - python3-setuptools
   - exuberant-ctags
   - apt-transport-https
-  - kitty
   - fonts-ibm-plex