From 9ef8a5cac24e4e37d5569031ce5471d9a5eef9c4 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 6 Dec 2022 01:43:00 -0500
Subject: [PATCH] move user settings to etc

---
 modules/gnome.nix            |  2 +-
 modules/profiles/desktop.nix |  2 +-
 modules/sean.nix             |  2 +-
 modules/user-settings.nix    | 16 ----------------
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 modules/user-settings.nix

diff --git a/modules/gnome.nix b/modules/gnome.nix
index 8ddaca4..9df6883 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -40,7 +40,7 @@ in
       '')
     ];
 
-    sconfig.user-settings = ''
+    environment.etc."my-settings.sh".text = ''
       gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
       gsettings set org.gnome.desktop.interface enable-hot-corners false
       gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index c2b49cf..2deb138 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -92,7 +92,7 @@ with lib;
 
     ];
 
-    sconfig.user-settings = ''
+    environment.etc."my-settings.sh".text = ''
       mkdir -p ~/.config/Code/User
       ln -sf /etc/vscode-settings.json ~/.config/Code/User/settings.json
       ln -sf /etc/vscode-keybindings.json ~/.config/Code/User/keybindings.json
diff --git a/modules/sean.nix b/modules/sean.nix
index a3877a6..cea91e4 100644
--- a/modules/sean.nix
+++ b/modules/sean.nix
@@ -42,7 +42,7 @@ in
       (x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake bck"))
       [ "boot" "build" "switch" "test" ];
 
-  sconfig.user-settings = ''
+  environment.etc."my-settings.sh".text = ''
     git config --global user.email "sean.bck@gmail.com"
     git config --global user.name "Sean Buckley"
   '';
diff --git a/modules/user-settings.nix b/modules/user-settings.nix
deleted file mode 100644
index 5bc6ee2..0000000
--- a/modules/user-settings.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.sconfig.user-settings;
-in
-{
-  options.sconfig.user-settings = lib.mkOption {
-    type = lib.types.nullOr lib.types.lines;
-    default = null;
-  };
-
-  config = lib.mkIf (cfg != null) {
-    environment.systemPackages = [
-      (pkgs.writeShellScriptBin "my-settings" cfg)
-    ];
-  };
-}