From f64b58d6f5f963613dd653e56a61e07fbe7b7ec8 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 3 Oct 2022 17:46:49 +0100
Subject: [PATCH] fix: update bash path

---
 bin/bin/tmux-sessioniser                |  2 +-
 nixpkgs/home-manager/modules/common.nix | 65 ++++---------------------
 nixpkgs/nixos/apollo/configuration.nix  | 22 +++++----
 roles/neovim/tasks/main.yaml            | 49 -------------------
 4 files changed, 23 insertions(+), 115 deletions(-)

diff --git a/bin/bin/tmux-sessioniser b/bin/bin/tmux-sessioniser
index b42fe16..62d4abb 100755
--- a/bin/bin/tmux-sessioniser
+++ b/bin/bin/tmux-sessioniser
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Quickly navigate between different directories using fzf and tmux sessions
 # (Thanks, ThePrimeagen!).
diff --git a/nixpkgs/home-manager/modules/common.nix b/nixpkgs/home-manager/modules/common.nix
index 9292518..0c7c091 100644
--- a/nixpkgs/home-manager/modules/common.nix
+++ b/nixpkgs/home-manager/modules/common.nix
@@ -31,64 +31,17 @@
 
   programs.neovim = {
     enable = true;
-    vimAlias = true;
-    plugins = with pkgs; [
-      vimPlugins.comment-nvim
-      vimPlugins.git-worktree-nvim
-      vimPlugins.gitsigns-nvim
-      vimPlugins.harpoon
-      vimPlugins.impatient-nvim
-      vimPlugins.nvim-web-devicons
-      vimPlugins.refactoring-nvim
-      vimPlugins.rest-nvim
-      vimPlugins.vim-abolish
-      vimPlugins.vim-highlightedyank
-      vimPlugins.vim-polyglot
-      vimPlugins.vim-repeat
-      vimPlugins.vim-surround
-      vimPlugins.vim-test
 
-      # Treesitter
-      vimPlugins.nvim-treesitter
-      vimPlugins.nvim-treesitter-context
-      vimPlugins.nvim-treesitter-textobjects
+    extraConfig = ''
+    lua << EOF
+    vim.opt.number = true
+    vim.opt.relativenumber = true
+    EOF
+    '';
 
-      # LSP
-      vimPlugins.null-ls-nvim
-      vimPlugins.nvim-lspconfig
-      vimPlugins.lsp-status-nvim
-
-      # Completion
-      vimPlugins.cmp-buffer
-      vimPlugins.cmp-cmdline
-      vimPlugins.cmp-nvim-lsp
-      vimPlugins.cmp-path
-      vimPlugins.cmp-treesitter
-      vimPlugins.cmp-vsnip
-      vimPlugins.cmp_luasnip
-      vimPlugins.lspkind-nvim
-      vimPlugins.nvim-cmp
-
-      vimPlugins.luasnip
-
-      # Telescope
-      vimPlugins.plenary-nvim
-      vimPlugins.popup-nvim
-      vimPlugins.telescope-file-browser-nvim
-      vimPlugins.telescope-fzf-native-nvim
-      vimPlugins.telescope-nvim
-      vimPlugins.telescope-ui-select-nvim
-
-      # Git
-      vimPlugins.neogit
-
-      # Databases
-      vimPlugins.vim-dadbod
-      vimPlugins.vim-dadbod-ui
-      vimPlugins.vim-dadbod-completion
-
-      # Themes
-      vimPlugins.nightfox-nvim
+    plugins = with pkgs.vimPlugins; [
+      plenary-nvim
+      telescope-nvim
     ];
   };
 }
diff --git a/nixpkgs/nixos/apollo/configuration.nix b/nixpkgs/nixos/apollo/configuration.nix
index 850dc9b..491672d 100644
--- a/nixpkgs/nixos/apollo/configuration.nix
+++ b/nixpkgs/nixos/apollo/configuration.nix
@@ -34,19 +34,24 @@ in
   # Select internationalisation properties.
   i18n.defaultLocale = "en_GB.utf8";
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
   services.xserver = {
+    enable = true;
     layout = "gb";
     xkbVariant = "";
+  
+    windowManager.awesome = {
+      enable = true;
+
+      luaModules = with pkgs.luaPackages; [
+        luarocks # is the package manager for Lua modules
+        luadbi-mysql # Database abstraction layer
+      ];
+    };
   };
 
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
   # Configure console keymap
   console.keyMap = "uk";
 
@@ -120,7 +125,6 @@ in
       tmuxinator
       tree
       unzip
-      vim
       vlc
       wget
       yt-dlp
diff --git a/roles/neovim/tasks/main.yaml b/roles/neovim/tasks/main.yaml
index 552281f..0807ff5 100644
--- a/roles/neovim/tasks/main.yaml
+++ b/roles/neovim/tasks/main.yaml
@@ -1,53 +1,4 @@
 ---
-- name: Dependencies
-  ansible.builtin.package:
-    name:
-      - autoconf
-      - automake
-      - cmake
-      - curl
-      - doxygen
-      - g++
-      - gettext
-      - libtool
-      - libtool-bin
-      - ninja-build
-      - pkg-config
-      - unzip
-    state: latest
-  become: yes
-
-- name: Clone
-  ansible.builtin.git:
-    clone: yes
-    depth: 1
-    dest: "{{ ansible_user_dir }}/build/neovim"
-    repo: https://github.com/neovim/neovim.git
-    # single_branch: yes
-    update: yes
-    version: "{{ neovim_version | default('master') }}"
-  register: clone
-
-- name: Build
-  make:
-    chdir: "{{ ansible_user_dir }}/build/neovim"
-    params:
-      CMAKE_BUILD_TYPE: RelWithDebInfo
-  when: clone.changed
-
-- name: Install
-  make:
-    chdir: "{{ ansible_user_dir }}/build/neovim"
-    target: install
-  become: yes
-  when: clone.changed
-
-- name: Remove build folder
-  ansible.builtin.file:
-    path: "{{ ansible_user_dir }}/build/neovim/build"
-    state: absent
-  become: yes
-
 - name: Create .config/nvim directory
   ansible.builtin.file:
     path: "{{ ansible_user_dir }}/.config/nvim"