modules/common/default.nix

@@ -79,16 +79,9 @@
         warn-dirty = false
       '';
 
-      gc = {
-        automatic = true;
-        dates = "weekly";
-        options = "--delete-older-than 7d";
-      };
-
       settings = {
 
         # Add community Cachix to binary cache
-        builders-use-substitutes = true;
         substituters = lib.mkIf (!pkgs.stdenv.isDarwin)
           [ "https://nix-community.cachix.org" ];
         trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [

modules/common/mail/default.nix

@@ -50,6 +50,8 @@
             ];
             alot = { };
             flavor = "plain";
+            folders = { };
+            getmail = { };
             imap = {
               host = config.mail.imapHost;
               port = 993;
@@ -73,6 +75,7 @@
                 CopyArrivalDate = "yes"; # Sync time of original message
               };
             };
+            mu.enable = false;
             notmuch.enable = true;
             passwordCommand =
               "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${

modules/nixos/gaming/chiaki.nix

@@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  options.gaming.chiaki.enable =
-    lib.mkEnableOption "Chiaki PlayStation remote play client.";
-
-  config = lib.mkIf config.gaming.chiaki.enable {
-    environment.systemPackages = with pkgs; [ chiaki ];
-  };
-
-}

modules/nixos/gaming/default.nix

@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }: {
 
   imports = [
-    ./chiaki.nix
     ./leagueoflegends.nix
     ./legendary.nix
     ./lutris.nix

modules/nixos/graphical/polybar.nix

@@ -107,7 +107,7 @@
             format = "<label>";
             exec = builtins.toString (pkgs.writeShellScript "mailcount.sh" ''
               ${pkgs.notmuch}/bin/notmuch new > /dev/null
-              UNREAD=$(${pkgs.notmuch}/bin/notmuch count is:inbox and is:unread and folder:main/Inbox)
+              UNREAD=$(${pkgs.notmuch}/bin/notmuch count is:inbox and is:unread)
               if [ $UNREAD = "0" ]; then
                 echo ""
               else

modules/nixos/hardware/networking.nix

@@ -10,16 +10,10 @@
     networking.interfaces.wlp4s0.useDHCP = true;
 
     networking.firewall.allowPing = lib.mkIf config.server true;
-
+    networking.hosts = {
-    # DNS service discovery
+      "192.168.0.120" = [ "tempest" ];
-    services.avahi.enable = true;
+      "192.168.0.218" = [ "swan" ];
-    # services.avahi.public.enable = true;
+    };
-    # services.avahi.public.domain = true;
-    # services.avahi.public.addresses = true;
-    # services.avahi.domainName = "local";
-
-    # Resolve local hostnames using Avahi DNS
-    services.avahi.nssmdns = true;
 
   };
 

modules/nixos/hardware/sleep.nix

@@ -13,9 +13,6 @@
       # /r/archlinux/comments/y7b97e/my_computer_wakes_up_immediately_after_i_suspend/isu99sr/
       echo GPP0 > /proc/acpi/wakeup
 
-      # Possibly need to wait a beat for settings to kick in
-      sleep 2
-
       set -e
     '';