3 files changed, 16 insertions, 18 deletions
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 3ec95d5..cc13626 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -10,10 +10,13 @@ _: {
     ./users.nix
   ];
 
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    settings.warn-dirty = false;
   };
   # config.services.kmscon.enable = true;
 }
diff --git a/hosts/common/locale.nix b/hosts/common/locale.nix
index 3e28cfd..e9c7a80 100644
--- a/hosts/common/locale.nix
+++ b/hosts/common/locale.nix
@@ -1,10 +1,9 @@
 _: {
   i18n = {
+    supportedLocales = [
+      "en_US.UTF-8/UTF-8"
+    ];
     defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LC_MESSAGES = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
-    };
   };
 
   time = {
diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 297e9e8..eb60f10 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -4,27 +4,22 @@
 }:
 let
   gui = desktop != "";
-  pinentry =
+  pinentry = with pkgs;
     if desktop == "gnome"
-    then pkgs.pinentry-gnome
-    else pkgs.pinentry-curses;
+    then pinentry-gnome
+    else pinentry-curses;
 in
 {
   environment.systemPackages = with pkgs;
     [
-      git
       neofetch
       python311
-      vim
     ]
-    ++ (
-      if gui
-      then with pkgs; [ firefox ]
-      else [ ]
-    )
     ++ [ pinentry ];
 
   programs = {
+    firefox.enable = if gui then true else false;
+    git.enable = true;
     gnupg = {
       agent = {
         enable = true;
@@ -34,5 +29,6 @@ in
           else "curses";
       };
     };
+    vim.defaultEditor = true;
   };
 }