feat: Add protonmail-bridge/git-send-email experiment

* Update flake.lock
* Stylix themes cursor
* Better integration between personal nixos and hm modules
* Remove outdated gnome settings

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
     # Dotfiles management
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -53,6 +54,7 @@
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs-stable";
     };
     stylix = {
       url = "github:danth/stylix";

homeModules/default.nix

@@ -1 +1,4 @@
-{ personal.imports = [ ./personal ]; }
+{
+  personal.imports = [ ./personal ];
+  protonmail-bridge.imports = [ ./protonmail-bridge ];
+}

homeModules/personal/default.nix

@@ -1,4 +1,4 @@
-{ inputs, lib, ... }: {
+{ self, inputs, lib, ... }: {
   imports = [
     ./gnome
     ./roles

homeModules/personal/editor.nix

@@ -30,7 +30,7 @@ in {
 
     home.packages = with pkgs; [
       # provides LSPs for CSS, SCSS, HTML, and JSON
-      nodePackages.vscode-langservers-extracted
+      # nodePackages.vscode-langservers-extracted
       yaml-language-server
       nodePackages.bash-language-server
       # markdown LSP

homeModules/personal/gnome/appearance.nix

@@ -5,10 +5,6 @@ in {
     home.packages = with pkgs; [
       gnomeExtensions.alphabetical-app-grid
       gnomeExtensions.appindicator
-      gnomeExtensions.blur-my-shell
-      gnomeExtensions.night-theme-switcher
-      # libadwaita lookalike for gtk3
-      adw-gtk3
     ];
 
     dconf = {
@@ -17,20 +13,8 @@ in {
           enabled-extensions = [
             "AlphabeticalAppGrid@stuarthayhurst"
             "[email protected]"
-            "blur-my-shell@aunetx"
-            "[email protected]"
           ];
         };
-        "org/gnome/desktop/interface" = { gtk-theme = "adw-gtk3"; };
-        "org/gnome/shell/extensions/nightthemeswitcher/time" = {
-          nightthemeswitcher-ondemand-keybinding = [ "<Shift><Super>t" ];
-        };
-        "org/gnome/shell/extensions/nightthemeswitcher/gtk-variants" = {
-          enabled = true;
-          day = "adw-gtk3";
-          night = "adw-gtk3-dark";
-        };
-        "org/gnome/Console" = { theme = "auto"; };
       };
     };
   };

homeModules/personal/gnome/extra.nix

@@ -32,5 +32,10 @@ in {
         "org/gnome/desktop/datetime" = { automatic-timezone = true; };
       };
     };
+
+    programs.git = {
+      package = pkgs.gitFull;
+      extraConfig.credential.helper = "libsecret";
+    };
   };
 }

homeModules/personal/gnome/input.nix

@@ -40,6 +40,7 @@ in {
       "org/gnome/shell/extensions/paperwm" = {
         show-workspace-indicator = false;
       };
+      "org/gnome/desktop/interface" = { gtk-enable-primary-paste = false; };
     };
   };
 }

homeModules/personal/roles/work.nix

@@ -16,6 +16,7 @@ in {
         exec ${pkgs.awscli2}/bin/aws "$@"
       '')
       beekeeper-studio
+      protonmail-desktop
     ];
 
     xdg.desktopEntries.httpie-desktop = {
@@ -25,5 +26,10 @@ in {
       terminal = false;
       categories = [ "Application" "Network" ];
     };
+
+    personal.cluster-admin.enable = lib.mkDefault true;
+    personal.sectools.enable = lib.mkDefault true;
+    personal.vscode.enable = lib.mkDefault true;
+    personal.firefox.enable = lib.mkDefault true;
   };
 }

homeModules/protonmail-bridge/default.nix

@@ -0,0 +1,41 @@
+{ pkgs, config, lib, ... }:
+let cfg = config.services.protonmail-bridge;
+in {
+  options.services.protonmail-bridge = {
+    enable = lib.mkEnableOption "Enable protonmail-bridge";
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.protonmail-bridge;
+      description = "Protonmail Bridge package";
+    };
+    enableGitSendEmail = lib.mkEnableOption "Enable git send-email";
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.user.services.protonmail-bridge = {
+      enable = true;
+      Unit = {
+        Description = "Protonmail Bridge";
+        PartOf = "graphical-session.target";
+      };
+      Install = { WantedBy = [ "graphical-session.target" ]; };
+      Service = {
+        Type = "simple";
+        ExecStart =
+          "${cfg.package}/bin/protonmail-bridge --noninteractive --log-level info";
+
+      };
+    };
+  } // lib.mkIf (cfg.enable && cfg.enableGitSendEmail) {
+    programs.git = {
+      package = lib.mkDefault pkgs.gitFull;
+      extraConfig = {
+        sendemail = {
+          smtpServer = "localhost";
+          smptPort = lib.mkDefault 1025;
+          smtpUser = lib.mkDefault config.programs.git.userEmail;
+        };
+      };
+    };
+  };
+}

hostModules/personal/gnome.nix

@@ -6,6 +6,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    home-manager.sharedModules = [{ personal.gnome.enable = true; }];
+
     personal.sound.enable = lib.mkDefault true;
 
     services.xserver.enable = true;

hostModules/personal/stylix.nix

@@ -9,6 +9,11 @@
           name = "JetBrains Mono";
         };
       };
+
+      cursor = {
+        name = "Adwaita";
+        package = pkgs.adwaita-icon-theme;
+      };
     };
   };
 }

hostModules/personal/user.nix

@@ -26,10 +26,10 @@ in {
       useGlobalPkgs = true;
       useUserPackages = true;
       extraSpecialArgs = { inherit self inputs secrets keys; };
-      users.${cfg.name} = {
+      sharedModules = [{
         home.stateVersion = config.system.stateVersion;
         imports = [ self.homeModules.personal ];
-      };
+      }];
     };
   };
 }

hosts/dionysus/default.nix

@@ -55,20 +55,8 @@
 
   networking.hostName = "dionysus";
   home-manager.users.${config.personal.user.name} = {
-    personal.vscode.enable = true;
-    personal.gnome.enable = true;
     personal.gnome.enableGSConnect = true;
     personal.fonts.enable = true;
-    personal.sectools.enable = true;
-    personal.firefox.enable = true;
-    personal.kitty.enable = true;
-    # personal.firefox.gnome-theme.enable = true;
-    # personal.firefox.sideberry-autohide = {
-    #   enable = true;
-    #   profiles = [ "default" ];
-    # };
-
-    personal.cluster-admin.enable = true;
 
     programs.firefox.profiles.default.settings = {
       "gfx.webrender.all" = true; # Force enable GPU acceleration