major refactor and reorg

homes/emenel/default.nix

@@ -8,6 +8,11 @@
                ++ [ inputs.emacs-overlay.overlays.default ];
   };
 
+  imports = with nix-config.homeModules; [
+    mako
+    mpv
+	];
+
   home = {
     packages = lib.mkMerge [
       [
@@ -17,6 +22,7 @@
         inputs.shikane.packages.x86_64-linux.default
         inputs.isd.packages.x86_64-linux.default
         inputs.hyprpicker.packages.x86_64-linux.default
+        inputs.hyprlock.packages.x86_64-linux.default
       ]
 
       (with nix-config.packages.x86_64-linux; [
@@ -87,7 +93,6 @@
         gst_all_1.gstreamer
         alsa-oss
         powertop
-        hypridle
         age
         sops
 
@@ -398,7 +403,6 @@
 
     defaultSopsFile = ./secrets.yaml;
 
-
     secrets = {
       bw_client_id = {
         path = "${config.sops.defaultSymlinkPath}/bw_client_id";
@@ -415,37 +419,47 @@
     };
   };
 
-  programs = {
-    home-manager.enable = true;
-    mpv = {
-      enable = true;
-      package = (pkgs.mpv-unwrapped.wrapper {
-        scripts = with pkgs.mpvScripts; [
-          thumbfast
-          modernz
-        ];
-
-        mpv = pkgs.mpv-unwrapped.override {
-          waylandSupport = true;
-          ffmpeg = pkgs.ffmpeg-full;
+  accounts.email = {
+    maildirBasePath = "/home/emenel/.maildir";
+    accounts = {
+      "matt@emenel.ca" = {
+        address = "matt@emenel.ca";
+        realName = "Matt Nish-Lapidus";
+        primary = true;
+        mu.enable = true;
+        mbsync = {
+          enable = true;
+          create = "maildir";
         };
-      });
-      config = {
-        osc = "no";
-        profile = "high-quality";
-        ytdl-format = "bestvideo+bestaudio";
-        cache-default = 4000000;
+        msmtp.enable = true;
+        flavor = "fastmail.com";
+        passwordCommand = "rbw get mu4e-fastmail";
+      };
+
+      "admin@studyoftime.org" = {
+        address = "admin@studyoftime.org";
+        realName = "ISST Web Admin";
+        mu.enable = true;
+        mbsync = {
+          enable = true;
+          create = "maildir";
+        };
+        msmtp.enable = true;
+        passwordCommand = "rbw get admin@studyoftime";
+        imap.host = "imap.dreamhost.com";
+        smtp.host = "imap.dreamhost.com";
+        userName = "admin@studyoftime.org";
       };
     };
+  };
+
+  programs = {
+    home-manager.enable = true;
+
     direnv = {
       enable = true;
       nix-direnv.enable = true;
     };
-    yazi = {
-      enable = true;
-      enableFishIntegration = true;
-      package = inputs.yazi.packages.x86_64-linux.default;
-    };
     fish = {
       enable = true;
       shellAliases = {
@@ -476,7 +490,9 @@
       enable = true;
     };
     mu.enable = true;
-    mbsync.enable = true;
+    mbsync = {
+      enable = true;
+    };
     msmtp.enable = true;
     emacs = {
       enable = true;
@@ -509,6 +525,7 @@
     wezterm = {
       enable = true;
       package = inputs.wezterm.packages.${pkgs.system}.default;
+      extraConfig = lib.readFile ./dotfiles/dot_config/wezterm/wezterm.lua;
     };
     bat = {
       enable = true;
@@ -562,25 +579,12 @@
       lfs.enable = true;
     };
     htop.enable = true;
-    nnn = {
-      enable = true;
-    };
     pandoc.enable = true;
     password-store.enable = true;
-    wlogout = {
-      enable = true;
-    };
-    hyprlock = {
-      enable = true;
-    };
 
     waybar = {
       enable = true;
       package = pkgs.waybar;
-      # systemd = {
-      #   enable = true;
-      #   # target = "graphical-session.target";
-      # };
     };
     eww = {
       enable = true;
@@ -639,10 +643,8 @@
       enable = true;
       package = pkgs.playerctl;
     };
-    mako = {
-      enable = true;
-    };
-    # flatpak.enable = true;
+
+    flatpak.enable = true;
     syncthing = {
       enable = true;
       # tray.enable = true;
@@ -717,17 +719,15 @@
   };
 
   # moving files!
-  xdg.configFile."mako".source = ./dotfiles/dot_config/mako;
-  xdg.configFile."hypr".source = ./dotfiles/dot_config/hypr;
   xdg.configFile."halloy/config.toml".source = ./dotfiles/dot_config/halloy/config.toml;
   xdg.configFile."waybar".source = ./dotfiles/dot_config/waybar;
-  xdg.configFile."just/justfile".source = ./dotfiles/dot_config/just/justfile;
   xdg.configFile."starship.toml".source = ./dotfiles/dot_config/starship.toml;
-  xdg.configFile."ghostty".source = ./dotfiles/dot_config/ghostty;
-  xdg.configFile."wezterm".source = ./dotfiles/dot_config/wezterm;
+  xdg.configFile."niri/config.kdl".source = ./dotfiles/dot_config/niri/config.kdl;
+
+
+  xdg.configFile."just/justfile".source = ./dotfiles/dot_config/just/justfile;
   xdg.configFile."git".source = ./dotfiles/dot_config/git;
   xdg.configFile."rbw".source = ./dotfiles/dot_config/rbw;
-  xdg.configFile."niri/config.kdl".source = ./dotfiles/dot_config/niri/config.kdl;
   xdg.configFile."shikane".source = ./dotfiles/dot_config/shikane;
   home.file.".ssh/config".source = ./dotfiles/dot_ssh/config;
   home.file.".npmrc".source = ./dotfiles/dot_npmrc;
@@ -738,20 +738,17 @@
     source = ./dotfiles/dot_config/fish/functions;
     recursive = true;
   };
+
   home.file.".config/fish/completions" = {
     source = ./dotfiles/dot_config/fish/completions;
     recursive = true;
   };
-  xdg.configFile."yazi" = {
-    source = ./dotfiles/dot_config/yazi;
-    recursive = true;
-  };
 
   xdg.configFile."emacs".enable = false;
 
-  home.file.".msmtprc".source = ./dotfiles/dot_msmtprc;
-  home.file.".mbsyncrc".source = ./dotfiles/dot_mbsyncrc;
-  xdg.configFile."isyncrc".enable = false;
+  # home.file.".msmtprc".source = ./dotfiles/dot_msmtprc;
+  # home.file.".mbsyncrc".source = ./dotfiles/dot_mbsyncrc;
+  # xdg.configFile."isyncrc".enable = false;
 
   home.file.".local/bin" = {
     source = ./dotfiles/dot_local/bin;