From eac22be09510e42d2bfea792e9dcfb463a23f242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Thu, 18 Jan 2024 23:09:18 +0100
Subject: [PATCH] No Ansible by default

---
 hm/vim/default.nix | 3 ++-
 options.nix        | 1 -
 os/geoffrey.nix    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hm/vim/default.nix b/hm/vim/default.nix
index 1319381..55a19af 100644
--- a/hm/vim/default.nix
+++ b/hm/vim/default.nix
@@ -97,7 +97,8 @@
         vim-pandoc # Pandoc-specific stuff because there's no LSP for it
         vim-pandoc-syntax
       ] ++ lib.optionals config.frogeye.dev.ansible [
-        ansible-vim # TODO Doesn't have snippets
+        ansible-vim
+        # Doesn't generate snippets, but those are for UltiSnip anyways
       ];
       extraConfigLua = builtins.readFile ./symbols-outline-nvim.lua;
       extraConfigVim = ''
diff --git a/options.nix b/options.nix
index 222912a..a4ca176 100644
--- a/options.nix
+++ b/options.nix
@@ -47,7 +47,6 @@
   config = {
     frogeye = {
       dev = {
-        ansible = lib.mkDefault true;
         python = lib.mkDefault true;
       };
     };
diff --git a/os/geoffrey.nix b/os/geoffrey.nix
index df0159b..29b4f36 100644
--- a/os/geoffrey.nix
+++ b/os/geoffrey.nix
@@ -19,7 +19,9 @@
 
   home-manager = {
     users.geoffrey = { pkgs, ... }: {
-      frogeye = config.frogeye;
+      frogeye = lib.mkDefault config.frogeye;
+      # Propagating options that way doesn't seem to conserve priority info,
+      # this is not great. Hopefully mkDefault resolve conflicts.
     };
     # Makes VMs able to re-run
     useUserPackages = true;