Add discord

flake.nix

@@ -41,11 +41,17 @@
       nixpkgs,
       home-manager,
       install-system,
+      nix-vscode-extensions,
       stylix,
       ...
     }@inputs:
     let
       system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+        overlays = [ nix-vscode-extensions.overlays.default ];
+      };
     in
     {
       nixosConfigurations = {
@@ -53,7 +59,6 @@
           host = "laptop";
           profile = "desktop";
           username = "josh";
-          gpgSigningKey = "0x530DA0331EFE99F5";
         in nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = {
@@ -61,8 +66,8 @@
             inherit host;
             inherit profile;
             inherit username;
-            inherit gpgSigningKey;
           };
+          pkgs = pkgs;
           modules = [
             ./hosts/${host}
           ];
@@ -80,6 +85,7 @@
             inherit profile;
             inherit username;
           };
+          pkgs = pkgs;
           modules = [
             ./hosts/${host}
           ];
@@ -97,6 +103,7 @@
             inherit profile;
             inherit username;
           };
+          pkgs = pkgs;
           modules = [
             (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
             { environment.systemPackages = [ install-system.packages.${system}.default ]; }
@@ -114,7 +121,7 @@
             inherit profile;
             inherit username;
           };
-        pkgs = nixpkgs.legacyPackages.${system};
+        pkgs = pkgs;
         modules = [
           ./homes/josh/home.nix
           stylix.homeModules.stylix

homes/josh/home.nix

@@ -1,4 +1,6 @@
 {
+  config,
+  gpgSigningKey,
   lib,
   pkgs,
   profile,
@@ -25,6 +27,23 @@ with lib;
     ];
   };
 
+  programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        name = "Joshua Yuen";
+        email = "joshuayuen99@gmail.com";
+        # We need to do this to pass through the (optional) signing key from the hosts/* file
+        signingkey = if gpgSigningKey != "" then gpgSigningKey else config.modules.gpg.signingKey;
+      };
+      commit.gpgsign = true;
+      init.defaultBranch = "main";
+    };
+  };
+
+  # Enable GPG-agent for git signing
+  modules.gpg.enable = true;
+
   # Let Home Manager install and manage itself
   programs.home-manager.enable = true;
 

hosts/laptop/default.nix

@@ -12,4 +12,6 @@
     ./hardware.nix
     ./host-packages.nix
   ];
+
+  modules.gpg.signingKey = "0x530DA0331EFE99F5";
 }

modules/core/user.nix

@@ -15,7 +15,7 @@ in
   imports = [ inputs.home-manager.nixosModules.home-manager ];
   home-manager = {
     useUserPackages = true;
-    useGlobalPkgs = false;
+    useGlobalPkgs = true;
     backupFileExtension = "backup";
     extraSpecialArgs = {
       inherit
@@ -24,6 +24,7 @@ in
         profile
         username
         ;
+      gpgSigningKey = config.modules.gpg.signingKey;
     };
     users.${username} = {
       imports = [ ../../homes/${username}/home.nix ];

modules/homes/default.nix

@@ -4,11 +4,12 @@
 {
   imports = [
     ./direnv.nix
+    ./discord.nix
     ./firefox.nix
+    ./gpg.nix
     ./fzf.nix
     ./hyprland
     ./kitty.nix
-    ./overlays.nix
     ./stylix.nix
     ./vscodium.nix
     ./walker.nix

modules/homes/discord.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.modules.discord;
+in
+{
+  config = mkIf cfg.enable {
+    programs.discord = {
+      enable = true;
+      package = pkgs.discord;
+    };
+  };
+}

modules/homes/gpg.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.modules.gpg;
+in
+{
+  config = mkIf cfg.enable {
+    services = {
+      gpg-agent = {
+        enable = true;
+        enableSshSupport = true;
+        enableBashIntegration = true;
+        enableZshIntegration = true;
+        pinentry.package = pkgs.pinentry-qt;
+      };
+    };
+
+    home.packages = [ pkgs.gnupg ];
+
+    programs = {
+      gpg = {
+        enable = true;
+      };
+    };
+  };
+}

modules/homes/overlays.nix

@@ -1,11 +0,0 @@
-{
-  inputs,
-  ...
-}:
-{
-  nixpkgs = {
-    overlays = [
-      inputs.nix-vscode-extensions.overlays.default
-    ];
-  };
-}

modules/homes/vscodium.nix

@@ -24,6 +24,7 @@
         redhat.ansible
         redhat.vscode-yaml
         rvest.vs-code-prettier-eslint
+        vscodevim.vim
       ];
   };
 }

modules/options/default.nix

@@ -3,7 +3,9 @@
 }:
 {
   imports = [
+    ./discord.nix
     ./displayManager.nix
+    ./gpg.nix
     ./hyprland.nix
     ./localsend.nix
     ./pipewire.nix

modules/options/discord.nix

@@ -0,0 +1,13 @@
+{
+  lib,
+  ...
+}:
+with lib;
+{
+  options.modules.discord = {
+    enable = mkEnableOption {
+      default = false;
+      description = "Enable Discord";
+    };
+  };
+}

modules/options/gpg.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  ...
+}:
+with lib;
+{
+  options.modules.gpg = {
+    enable = mkEnableOption {
+      default = false;
+      description = "Enable gpg-agent";
+    };
+
+    signingKey = mkOption {
+      type = types.str;
+      default = "";
+      description = "The key ID to sign with for git";
+    };
+  };
+}

profiles/desktop/default.nix

@@ -23,4 +23,6 @@
   modules.shell.defaultShell = "zsh";
 
   modules.pipewire.enable = true;
+
+  modules.discord.enable = true;
 }