cachix/mjlbach.nix

@@ -0,0 +1,7 @@
+{
+  nix = {
+    binaryCaches = [ "https://mjlbach.cachix.org" ];
+    binaryCachePublicKeys =
+      [ "mjlbach.cachix.org-1:dR0V90mvaPbXuYria5mXvnDtFibKYqYc2gtl9MWSkqI=" ];
+  };
+}

cachix/nix-community.nix

@@ -1,8 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://nix-community.cachix.org" ];
-    binaryCachePublicKeys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}

modules/networking.nix

@@ -20,7 +20,7 @@
     wg0 = {
       address = [ "10.8.0.2/32" ];
       privateKeyFile = "/home/coolneng/.wg/keys/privatekey";
-      dns = [ "10.8.0.1" ];
+      dns = [ "176.9.37.132" "116.203.147.31" ];
       peers = [
         # zion
         {

modules/periodic.nix

@@ -6,10 +6,12 @@
   systemd.user.services.doom-upgrade = {
     description = "Upgrade Doom Emacs";
     wantedBy = [ "default.target" ];
-    path = with pkgs; [ bash emacsPgtkGcc git coreutils ];
+    path = [ pkgs.emacs pkgs.git ];
-    script =
+    serviceConfig = {
-      "${pkgs.bash}/bin/bash -c '/home/coolneng/.emacs.d/bin/doom -y upgrade'";
+      Type = "oneshot";
-    serviceConfig = { Type = "oneshot"; };
+      ExecStart =
+        "/bin/sh /home/coolneng/.emacs.d/bin/doom -y upgrade ; /bin/sh /home/coolneng/.emacs.d/bin/doom -y sync -u";
+    };
   };
 
   systemd.user.timers.doom-upgrade = {
@@ -25,10 +27,11 @@
   systemd.user.services.doom-purge = {
     description = "Purge Doom Emacs";
     wantedBy = [ "default.target" ];
-    path = with pkgs; [ bash emacsPgtkGcc git coreutils ];
+    path = [ pkgs.emacs ];
-    script =
+    serviceConfig = {
-      "${pkgs.bash}/bin/bash -c '/home/coolneng/.emacs.d/bin/doom -y purge'";
+      Type = "oneshot";
-    serviceConfig = { Type = "oneshot"; };
+      ExecStart = "/bin/sh /home/coolneng/.emacs.d/bin/doom purge";
+    };
   };
 
   systemd.user.timers.doom-purge = {
@@ -45,8 +48,10 @@
     description = "Upgrade Vim-Plug";
     wantedBy = [ "default.target" ];
     path = [ pkgs.git pkgs.neovim ];
-    script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
+    serviceConfig = {
-    serviceConfig = { Type = "oneshot"; };
+      Type = "oneshot";
+      ExecStart = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
+    };
   };
 
   systemd.user.timers.vim-plug-upgrade = {

modules/software.nix

@@ -20,7 +20,7 @@
     haskellPackages.pandoc-citeproc
     # Text editors
     neovim
-    emacsPgtkGcc
+    emacsGccPgtk
     ripgrep
     fd
     clang

overlays/emacs.nix

@@ -2,7 +2,7 @@
   nixpkgs.overlays = [
     (import (builtins.fetchTarball {
       url =
-        "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
+        "https://github.com/mjlbach/emacs-pgtk-nativecomp-overlay/archive/master.tar.gz";
     }))
   ];
 }