simple reorganization

2 files changed, 16 insertions, 21 deletions

diff --git a/configuration.nix b/configuration.nix
index f234f57..de8beeb 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -46,17 +46,6 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # TODO tmp cgit
-  services.cgit."git.localhost" = {
-    enable = true;
-    scanPath = "/srv/git";
-    nginx.virtualHost = "localhost";
-    extraConfig = ''
-      root-title=cgit experiment
-    '';
-    gitHttpBackend.checkExportOkFiles = false;
-  };
-
   nix.settings.trusted-users = [
     "root"
     "henz"
@@ -468,11 +457,6 @@
     })
   ];
 
-  # GnuPG
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
   services.pcscd.enable = true;
 
   #  services.ollama = {
@@ -485,9 +469,6 @@
   #    };
   #  };
 
-  # Install firefox.
-  programs.firefox.enable = true;
-
   programs.neovim = {
     enable = true;
     defaultEditor = true;
diff --git a/programs.nix b/programs.nix
index a38712d..73839a6 100644
--- a/programs.nix
+++ b/programs.nix
@@ -5,10 +5,24 @@
 
     haunt
 
-    (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
+    (aspellWithDicts (
+      dicts: with dicts; [
+        en
+        en-computers
+        en-science
+      ]
+    ))
   ];
 
-  programs.steam.enable = true;
+  programs = {
+    steam.enable = true;
+    firefox.enable = true;
+
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  };
 
   services.emacs = {
     enable = true;