home | refactor

flake.nix

@@ -7,11 +7,6 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
-    #home-manager = {
-      #url = "github:nix-community/home-manager/release-23.05";
-      #inputs.nixpkgs.follows = "nixpkgs";
-    #};
   };
 
   outputs = inputs@{
@@ -26,17 +21,16 @@
       workstation = {
         system = "x86_64-linux";
         modules = [
-          #inputs.disko.nixosModules.disko
           ./workstation
           inputs.home-manager.nixosModules.home-manager
           ./home
+          ./home/gui
           ./wm/sway
         ];
       };
       server = {
         system = "x86_64-linux";
         modules = [
-          #inputs.disko.nixosModules.disko
           ./server
           inputs.home-manager.nixosModules.home-manager
           ./home

home/common/bash.nix

@@ -1,5 +1,6 @@
 { config, pkgs, ... }:
 {
+  imports = [ ./bash_complition.nix ];
   home.file.".bash_aliases".source = files/bash/bash_aliases;
   home.file.".bash_functions".source = files/bash/bash_functions;
   home.file.".bash_hosts".source = files/bash/bash_hosts;

home/common/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./bash_complition.nix
+    ./bash.nix
     ./btop.nix
     ./git.nix
     ./gnupg.nix

home/common/mail.nix

@@ -1,5 +1,35 @@
-{...}:
+{ config, pkgs, ... }:
 {
+  accounts.email.accounts = {
+    "don@donharper.org" = {
+      primary = true;
+      realName = "Don Harper";
+      userName = "don";
+      address = "don@donharper.org";
+      #secondaries = [ "duck@duckland.org" "duckunix@gmail.com" ];
+      notmuch.enable = true;
+    };
+  };
+
+  programs.notmuch = {
+    enable = true;
+    new = {
+      tags = [ "unread" ];
+      ignore = [ ".mbsyncstate" ".uidvalidity" "Sent Mail" "Trash" ".mbsyncstate.journal" ".mbsyncstate.new" ".mbsyncstate.lock" ];
+    };
+    extraConfig = {
+      database = {
+        path = "/home/don/Mail";
+      };
+    };
+  };
+  home.file.".signature".text = ''
+
+
+    -- 
+    Don Harper
+  '';
+
   systemd.user =  {
      timers.mbsync = {
       Timer = {

home/default.nix

@@ -8,11 +8,7 @@
     users = {
       don = {
         imports = [
-          ./bash.nix
+          ./common
-          ./packages-cli.nix
-          ./packages-gui.nix
-          ./services.nix
-          ./systemd.nix
         ];
         home = {
           username = "don";

home/gui/default.nix

@@ -0,0 +1,162 @@
+{ pkgs, ... }:
+{
+  home-manager.users.don = {
+    imports = [
+      ./alacritty.nix
+      ./autostart.nix
+      ./fuzzel.nix
+      ./kde.nix
+      ./mpv.nix
+      ./redshift.nix
+      ./qutebrowser.nix
+      ./services.nix
+      ./sway.nix
+      ./terminals.nix
+      ./citrix.nix
+      ./zoom.nix
+    ];
+    home.packages = with pkgs; [
+      anonymousPro
+      at-spi2-core
+      authy
+      blueberry
+      clipman
+      cura
+      darktable
+      dmenu-wayland
+      firefox
+      font-awesome
+      gnome.gnome-tweaks
+      gnome.simple-scan
+      gnumeric
+      headset-charge-indicator
+      ibm-plex
+      imv
+      jellyfin-media-player
+      jetbrains-mono
+      kanshi
+      lapce
+      libappindicator
+      libnotify
+      libreoffice-fresh
+      libsForQt5.kwallet
+      neovim-qt
+      nerdfonts
+      networkmanagerapplet
+      nextcloud-client
+      nvd
+      obsidian
+      overpass
+      pasystray
+      pavucontrol
+      poweralertd
+      powerline-fonts
+      prusa-slicer
+      pwvucontrol
+      qpwgraph
+      quickemu
+      quickgui
+      qutebrowser
+      rofi
+      signal-desktop
+      sonixd
+      source-code-pro
+      supersonic
+      syncthingtray
+      tdesktop
+      texlive.combined.scheme-medium
+      thunderbird
+      victor-mono
+      widevine-cdm
+      yt-dlp
+    ];
+    xdg = {
+      mimeApps = {
+        enable = true;
+        associations.added = {
+          "application/octet-stream" = [ "gvim.desktop" ];
+          "application/pdf" = [ "qpdfview.desktop;org.gnome.Evince.desktop;org.pwmt.zathura-pdf-mupdf.desktop" ];
+          "audio/mpeg" = [ "org.kde.kid3.desktop" ];
+          "image/jpeg" = [ "gimp.desktop;feh.desktop" ];
+          "image/png" = [ "darktable.desktop;gimp.desktop;imv-folder.desktop;feh.desktop" ];
+          "image/x-adobe-dng" = [ "feh.desktop" ];
+          "inode/directory" = [ "thunar.desktop" ];
+          "text/plain" = [ "gvim.desktop" ];
+          "x-scheme-handler/pdf" = [ "pdfview.desktop" ];
+          "x-scheme-handler/tg" = [ "userapp-Telegram Desktop-9M6O50.desktop;userapp-Telegram Desktop-6IJLW1.desktop;userapp-Telegram Desktop-IQIXX1.desktop;userapp-Telegram Desktop-FK06Y1.desktop;userapp-Telegram Desktop-1SZ7Y1.desktop;userapp-Telegram Desktop-C24MZ1.desktop;userapp-Telegram Desktop-29FD01.desktop;userapp-Telegram Desktop-21P401.desktop;userapp-Telegram Desktop-LOTG11.desktop" ];
+        };
+        defaultApplications = {
+          "inode/directory" = [ "thunar.desktop" ];
+          "model/3mf" = [ "com.ultimaker.cura.desktop" ];
+          "model/gltf+json" = [ "com.ultimaker.cura.desktop" ];
+          "model/gltf-binary" = [ "com.ultimaker.cura.desktop" ];
+          "model/stl" = [ "com.ultimaker.cura.desktop" ];
+          "text/html" = [ "org.qutebrowser.qutebrowser.desktop" ];
+          "x-scheme-handler/about" = [ "org.qutebrowser.qutebrowser.desktop" ];
+          "x-scheme-handler/etcher" = [ "balena-etcher.desktop" ];
+          "x-scheme-handler/http" = [ "org.qutebrowser.qutebrowser.desktop" ];
+          "x-scheme-handler/https" = [ "org.qutebrowser.qutebrowser.desktop" ];
+          "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
+          "x-scheme-handler/pdf" = [ "myweb.desktop" ];
+          "x-scheme-handler/tg" = [ "userapp-Telegram Desktop-LOTG11.desktop" ];
+          "x-scheme-handler/tootle" = [ "com.github.bleakgrey.tootle.desktop" ];
+          "x-scheme-handler/unknown" = [ "org.qutebrowser.qutebrowser.desktop" ];
+          "application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
+          "x-scheme-handler/mailto" = [ "neomutt.desktop" ];
+        };
+      };
+      desktopEntries = {
+        mealplanning = {
+          terminal = false;
+          name = "Meal Planning";
+          exec = "/home/don/bin/meal-planning";
+          icon = "chrome-nkapoddcoleikgbpncmpcfkdjmheccge-Default";
+        };
+        neomutt = {
+          terminal = false;
+          name = "Neomutt";
+          exec = "/home/don/.local/share/qutebrowser/userscripts/mymail";
+          icon = "email";
+        };
+        muttmailto = {
+          terminal = false;
+          name = "mutt-mailto";
+          exec = "/home/don/bin/mutt-mailto";
+          icon = "chrome-kmhopmchchfpfdcdjodmpfaaphdclmlj-Default";
+        };
+        myweb = {
+          terminal = false;
+          name = "myweb";
+          exec = "/home/don/bin/myweb %u";
+          mimeType = [ "x-scheme-handler/pdf" ];
+        };
+        cooking-notebook = {
+          type = "Application";
+          name = "Cooking Notebook";
+          icon = "obsidian";
+          exec = "${pkgs.obsidian}/bin/obsidian obsidian://open\\?vault=Food\\&file=home";
+        };
+        mynotes  =  {
+          name = "My Notes";
+          exec = "${pkgs.obsidian}/bin/obsidian obsidian://open\\?vault=main\\&file=home";
+          terminal = false;
+          type = "Application";
+          icon = "obsidian";
+          comment = "Obsidian";
+          mimeType = [ "x-scheme-handler/obsidian" ];
+          categories = [ "Office" ];
+        };
+        journal  =  {
+          name = "Journal";
+          exec = "/home/don/bin/newjournal";
+          terminal = false;
+          type = "Application";
+          icon = "obsidian";
+          comment = "Obsidian Journal";
+          mimeType = [ "x-scheme-handler/obsidian" ];
+          categories = [ "Office" ];
+        };
+      };
+    };
+  };
+}