WIP #14: first buildable Thomas system in a long while.

yipengsun · Sep 25, 2024 · 6d4d15c · 6d4d15c
1 parent acd7d8e
commit 6d4d15c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/hosts/Thomas.nix b/hosts/Thomas.nix
@@ -180,13 +180,13 @@ in
   # Legacy stuff #
   ################
 
-  environment.systemPackages = with pkgs; [
-    # Email
-    mutt
-    getmail6
-    msmtp
-    procmail
-    gnupg
-    w3m
-  ];
+  #environment.systemPackages = with pkgs; [
+  #  # Email
+  #  mutt
+  #  getmail6
+  #  msmtp
+  #  procmail
+  #  gnupg
+  #  w3m
+  #];
 }
diff --git a/modules/home/awesome-xinit/default.nix b/modules/home/awesome-xinit/default.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.xinit.windowManager.awesome;
   awesome = cfg.package;
 
-  getLuaPath = lib: dir: "${lib}/${dir}/lua/${cfg.luaPackages.lua.luaversion}";
+  getLuaPath = lib: dir: "${lib}/${dir}/lua/${awesome.lua.luaversion}";
   makeSearchPath = lib.concatMapStrings (path:
     " --search ${getLuaPath path "share"}"
     + " --search ${getLuaPath path "lib"}");

diff --git a/profiles/home/apps-extra/default.nix b/profiles/home/apps-extra/default.nix
@@ -21,7 +21,7 @@
     krop # crop figures from pdf
 
     # chat
-    wechat-uos
+    #wechat-uos
 
     # git utils
     #git-author-rewrite

diff --git a/profiles/home/wm/default.nix b/profiles/home/wm/default.nix
@@ -41,22 +41,21 @@ rec {
   age.secrets.weather_api_key_syp = {
     file = ../../../secrets/weather_api_key.age;
   };
-  home.file."weather_api_key" = {
-    source = config.age.secrets.weather_api_key_syp.path;
-    target = weatherApiKeyLoc;
-  };
+  #home.file."weather_api_key" = {
+  #  source = config.age.secrets.weather_api_key_syp.path;
+  #  target = weatherApiKeyLoc;
+  #};
 
-  xinit.requiredFiles = [ weatherApiKeyLoc ];
+  #xinit.requiredFiles = [ weatherApiKeyLoc ];
 
   # sadly you need to put this line in your host setting manually:
   #   services.xserver.displayManager.startx.enable = true;
-  xinit.enable = true;
+  #xinit.enable = true;
 
-  xinit.windowManager.awesome = {
+  xsession.windowManager.awesome = {
     enable = true;
 
     package = pkgs.awesome.override { lua = customLuaPackages.lua; };
-    luaPackages = customLuaPackages;
 
     luaModules = [
       customLuaPackages.vicious
@@ -80,5 +79,5 @@ rec {
   ];
 
   # enable dropbox
-  services.dropbox-autoreconnect.enable = true;
+  #services.dropbox-autoreconnect.enable = true;
 }