From 216c812f7b5280cf11b3b0f465543a00cfe1e173 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 30 Jan 2023 02:10:12 +0000
Subject: [PATCH] remove config.sane.home-manager.enable as it was always set
 anyway

---
 hosts/common/default.nix            |  1 -
 hosts/common/home/aerc.nix          |  3 +--
 hosts/common/home/firefox.nix       |  2 +-
 hosts/common/home/git.nix           |  3 +--
 hosts/common/home/keyring.nix       |  3 +--
 hosts/common/home/kitty.nix         |  3 +--
 hosts/common/home/libreoffice.nix   |  3 +--
 hosts/common/home/mime.nix          |  3 +--
 hosts/common/home/mpv.nix           |  3 +--
 hosts/common/home/neovim.nix        |  3 +--
 hosts/common/home/ssh.nix           |  5 +++--
 hosts/common/home/sublime-music.nix |  3 +--
 hosts/common/home/vlc.nix           |  1 -
 hosts/common/home/xdg-dirs.nix      |  3 +--
 hosts/common/home/zsh/default.nix   |  3 +--
 modules/default.nix                 |  1 -
 modules/home-manager/default.nix    | 14 --------------
 modules/packages.nix                |  4 ++--
 18 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 modules/home-manager/default.nix

diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index c8b4d6e3..7c2acbec 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -16,7 +16,6 @@
     ./vpn.nix
   ];
 
-  sane.home-manager.enable = true;
   sane.nixcache.enable-trusted-keys = true;
   sane.packages.enableConsolePkgs = true;
   sane.packages.enableSystemPkgs = true;
diff --git a/hosts/common/home/aerc.nix b/hosts/common/home/aerc.nix
index 86c2d8ec..995a83b9 100644
--- a/hosts/common/home/aerc.nix
+++ b/hosts/common/home/aerc.nix
@@ -1,7 +1,6 @@
 # Terminal UI mail client
-{ config, lib, sane-lib, ... }:
+{ config, sane-lib, ... }:
 
-lib.mkIf config.sane.home-manager.enable
 {
   sops.secrets."aerc_accounts" = {
     owner = config.users.users.colin.name;
diff --git a/hosts/common/home/firefox.nix b/hosts/common/home/firefox.nix
index 096ec5b6..9b63b292 100644
--- a/hosts/common/home/firefox.nix
+++ b/hosts/common/home/firefox.nix
@@ -145,7 +145,7 @@ in
     };
   };
 
-  config = lib.mkIf config.sane.home-manager.enable {
+  config = {
 
     # uBlock filter list configuration.
     # specifically, enable the GDPR cookie prompt blocker.
diff --git a/hosts/common/home/git.nix b/hosts/common/home/git.nix
index fb35b3f8..30e530c8 100644
--- a/hosts/common/home/git.nix
+++ b/hosts/common/home/git.nix
@@ -1,9 +1,8 @@
-{ config, lib, pkgs, sane-lib, ... }:
+{ lib, pkgs, sane-lib, ... }:
 
 let
   mkCfg = lib.generators.toINI { };
 in
-lib.mkIf config.sane.home-manager.enable
 {
   sane.fs."/home/colin/.config/git/config" = sane-lib.fs.wantedText (mkCfg {
     user.name = "Colin";
diff --git a/hosts/common/home/keyring.nix b/hosts/common/home/keyring.nix
index 58006348..e655a4ad 100644
--- a/hosts/common/home/keyring.nix
+++ b/hosts/common/home/keyring.nix
@@ -1,6 +1,5 @@
-{ config, lib, sane-lib, ... }:
+{ config, sane-lib, ... }:
 
-lib.mkIf config.sane.home-manager.enable
 {
   sane.persist.home.private = [ ".local/share/keyrings" ];
 
diff --git a/hosts/common/home/kitty.nix b/hosts/common/home/kitty.nix
index f4f0d351..524b19c1 100644
--- a/hosts/common/home/kitty.nix
+++ b/hosts/common/home/kitty.nix
@@ -1,6 +1,5 @@
-{ config, lib, pkgs, sane-lib, ... }:
+{ pkgs, sane-lib, ... }:
 
-lib.mkIf config.sane.home-manager.enable
 {
   sane.fs."/home/colin/.config/kitty/kitty.conf" = sane-lib.fs.wantedText ''
     # docs: https://sw.kovidgoyal.net/kitty/conf/
diff --git a/hosts/common/home/libreoffice.nix b/hosts/common/home/libreoffice.nix
index 418455c0..9663666c 100644
--- a/hosts/common/home/libreoffice.nix
+++ b/hosts/common/home/libreoffice.nix
@@ -1,6 +1,5 @@
-{ config, lib, sane-lib, ... }:
+{ sane-lib, ... }:
 
-lib.mkIf config.sane.home-manager.enable
 {
   # libreoffice: disable first-run stuff
   sane.fs."/home/colin/.config/libreoffice/4/user/registrymodifications.xcu" = sane-lib.fs.wantedText ''
diff --git a/hosts/common/home/mime.nix b/hosts/common/home/mime.nix
index 05f0a2bc..bf624be8 100644
--- a/hosts/common/home/mime.nix
+++ b/hosts/common/home/mime.nix
@@ -1,4 +1,4 @@
-{ config, lib, sane-lib, ...}:
+{ config, sane-lib, ...}:
 
 let
   www = config.sane.web-browser.browser.desktop;
@@ -9,7 +9,6 @@ let
   # audio = "mpv.desktop";
   audio = "vlc.desktop";
 in
-lib.mkIf config.sane.home-manager.enable
 {
 
   # the xdg mime type for a file can be found with:
diff --git a/hosts/common/home/mpv.nix b/hosts/common/home/mpv.nix
index e06e4f4e..51d5a97a 100644
--- a/hosts/common/home/mpv.nix
+++ b/hosts/common/home/mpv.nix
@@ -1,6 +1,5 @@
-{ config, lib, sane-lib, ... }:
+{ sane-lib, ... }:
 
-lib.mkIf config.sane.home-manager.enable
 {
   # format is <key>=%<length>%<value>
   sane.fs."/home/colin/.config/mpv/mpv.conf" = sane-lib.fs.wantedText ''
diff --git a/hosts/common/home/neovim.nix b/hosts/common/home/neovim.nix
index b9fa675b..ba7cc386 100644
--- a/hosts/common/home/neovim.nix
+++ b/hosts/common/home/neovim.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   inherit (builtins) map;
@@ -70,7 +70,6 @@ let
   plugin-config-tex = concatMapStrings (p: optionalString (p.type or "" == "viml") p.config) plugins;
   plugin-config-lua = concatMapStrings (p: optionalString (p.type or "" == "lua") p.config) plugins;
 in
-lib.mkIf config.sane.home-manager.enable
 {
   # private because there could be sensitive things in the swap
   sane.persist.home.private = [ ".cache/vim-swap" ];
diff --git a/hosts/common/home/ssh.nix b/hosts/common/home/ssh.nix
index afd7c4ea..426fde58 100644
--- a/hosts/common/home/ssh.nix
+++ b/hosts/common/home/ssh.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sane-lib, ... }:
+{ config, lib, sane-lib, ... }:
 
 with lib;
 let
@@ -9,7 +9,8 @@ let
     "\n"
     (map (k: k.asHostKey) host-keys)
   ;
-in lib.mkIf config.sane.home-manager.enable {
+in
+{
   # ssh key is stored in private storage
   sane.persist.home.private = [ ".ssh/id_ed25519" ];
   sane.fs."/home/colin/.ssh/id_ed25519.pub" = sane-lib.fs.wantedText user-pubkey;
diff --git a/hosts/common/home/sublime-music.nix b/hosts/common/home/sublime-music.nix
index 243338ee..5cb5d3be 100644
--- a/hosts/common/home/sublime-music.nix
+++ b/hosts/common/home/sublime-music.nix
@@ -1,6 +1,5 @@
-{ config, lib, sane-lib, ... }:
+{ config, sane-lib, ... }:
 
-lib.mkIf config.sane.home-manager.enable
 {
   # TODO: this should only be shipped on gui platforms
   sops.secrets."sublime_music_config" = {
diff --git a/hosts/common/home/vlc.nix b/hosts/common/home/vlc.nix
index ef92d0db..ea120a8a 100644
--- a/hosts/common/home/vlc.nix
+++ b/hosts/common/home/vlc.nix
@@ -8,7 +8,6 @@ let
     builtins.map (feed: feed.url) wanted-feeds
   );
 in
-lib.mkIf config.sane.home-manager.enable
 {
   sane.fs."/home/colin/.config/vlc/vlcrc" = sane-lib.fs.wantedText ''
     [podcast]
diff --git a/hosts/common/home/xdg-dirs.nix b/hosts/common/home/xdg-dirs.nix
index 243bb44f..51983320 100644
--- a/hosts/common/home/xdg-dirs.nix
+++ b/hosts/common/home/xdg-dirs.nix
@@ -1,6 +1,5 @@
-{ config, lib, sane-lib, ...}:
+{ lib, sane-lib, ...}:
 
-lib.mkIf config.sane.home-manager.enable
 {
   # XDG defines things like ~/Desktop, ~/Downloads, etc.
   # these clutter the home, so i mostly don't use them.
diff --git a/hosts/common/home/zsh/default.nix b/hosts/common/home/zsh/default.nix
index 01b855ec..1985a280 100644
--- a/hosts/common/home/zsh/default.nix
+++ b/hosts/common/home/zsh/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sane-lib, ... }:
+{ pkgs, sane-lib, ... }:
 
 let
   # powerlevel10k prompt config
@@ -25,7 +25,6 @@ let
     source ${pkgs.zsh-prezto}/share/zsh-prezto/init.zsh
   '';
 in
-lib.mkIf config.sane.home-manager.enable
 {
   sane.persist.home.plaintext = [
     # we don't need to full zsh dir -- just the history file --
diff --git a/modules/default.nix b/modules/default.nix
index 4e819ec7..83be0376 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./feeds.nix
     ./fs
-    ./home-manager
     ./ids.nix
     ./packages.nix
     ./image.nix
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
deleted file mode 100644
index 0a2cec4d..00000000
--- a/modules/home-manager/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.sane.home-manager;
-in
-{
-  options = {
-    sane.home-manager.enable = mkOption {
-      default = false;
-      type = types.bool;
-    };
-  };
-}
diff --git a/modules/packages.nix b/modules/packages.nix
index b5e02bd9..427c819e 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -129,7 +129,7 @@ let
       ".local/share/nheko"  # per-account state database
     ]; }
 
-    # settings (electron app). TODO: can i manage these settings with home-manager?
+    # settings (electron app)
     { pkg = obsidian; dir = [ ".config/obsidian" ]; }
 
     pavucontrol
@@ -186,7 +186,7 @@ let
     # creds, media
     { pkg = signal-desktop; private = [ ".config/Signal" ]; }
 
-    # creds. TODO: can i manage this with home-manager?
+    # creds, widevine .so download. TODO: could easily manage these statically.
     { pkg = spotify; dir = [ ".config/spotify" ]; }
 
     # hardenedMalloc solves a crash at startup