variables and dotfile configs

base.nix

@@ -166,9 +166,6 @@
         WLR_NO_HARDWARE_CURSORS = 1;
         NIXOS_OZONE_WL = 1;
 
-        # Themes
-        # WEBKIT_DISABLE_COMPOSITING_MODE = "1";
-
         PATH = [ "\${HOME}/.local/bin" ];
       };
   };

home-manager.nix

@@ -44,10 +44,9 @@
       templates = "${config.xdg.dataHome}/Templates";
       videos = "${config.home.homeDirectory}/Videos";
     };
-    configFile."wgetrc".text = "hsts-file=\${XDG_CACHE_HOME}/wget-hsts";
+    configFile.wgetrc.text = "hsts-file=\${XDG_CACHE_HOME}/wget-hsts";
   };
   programs = {
-    alacritty.enable = true;
     direnv = {
       enable = true;
       enableBashIntegration = true;

jawz.nix

@@ -28,8 +28,8 @@ in
     group = "users";
     overrideDevices = true;
     overrideFolders = true;
-    key = "${config.sops.secrets."syncthing_keys/${hostName}".path}";
-    cert = "${config.sops.secrets."syncthing_certs/${hostName}".path}";
+    key = config.sops.secrets."syncthing_keys/${hostName}".path;
+    cert = config.sops.secrets."syncthing_certs/${hostName}".path;
     settings = {
       devices = {
         server.id = "BG6PF7S-KATABWO-7WAZFMX-6YO7IS3-WQTMR3M-VSOSV7V-HFFMNNH-BFX2EQ4";

modules/dev/emacs.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   config,
   lib,
   pkgs,
@@ -10,40 +9,33 @@
   config = lib.mkIf config.my.emacs.enable {
     home-manager.users.jawz = {
       services.lorri.enable = true;
-      programs.bash = {
-        initExtra = ''
-          emacs-sqlite-fix () {
-            nix-shell -p cmake sqlite --command "doom sync &&
-                sc restart emacs &&
-                emacsclient -e '(org-roam-db-sync)'" &&
-                doom sync
-          }
-        '';
-        shellAliases = {
-          edit = "emacsclient -t";
-          e = "edit";
-        };
+      programs.bash.shellAliases = {
+        edit = "emacsclient -t";
+        e = "edit";
       };
     };
     services.emacs = {
       enable = true;
       package = pkgs.emacsWithDoom {
         doomDir = ../../dotfiles/doom;
-        doomLocalDir = "~/.local/share/nix-doom";
+        doomLocalDir = "$HOME/.local/share/nix-doom";
         emacs = pkgs.emacs-gtk;
         extraPackages =
           epkgs:
           let
-            extraPackages = config.home-manager.users.jawz.programs.emacs.extraPackages epkgs;
+            inherit (config.home-manager.users.jawz.programs.emacs)
+              extraPackages
+              extraConfig
+              ;
+            extra = extraPackages epkgs;
           in
-          extraPackages
+          extra
           ++ [
             (epkgs.trivialBuild {
               pname = "stylix-theme";
-              # add config from doom's ui/doom module
-              src = pkgs.writeText "stylix-theme.el" config.home-manager.users.jawz.programs.emacs.extraConfig;
+              src = pkgs.writeText "stylix-theme.el" extraConfig;
               version = "0.1.0";
-              packageRequires = extraPackages;
+              packageRequires = extra;
             })
           ];
         extraBinPackages = builtins.attrValues {
@@ -72,7 +64,6 @@
         };
       };
       defaultEditor = true;
-      # extraPackages = [ pkgs.base16-stylix-theme ];
     };
     environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ];
   };