Add git to sysconf

Author: staticdev

README.md

@@ -13,7 +13,7 @@
 - Browsers: [Brave] and [Mullvad Browser] (via Nix).
 - Containers and virtualization: [Docker], [Podman] and [libvirtd].
 - Office: installs [OnlyOffice] (via Nixpkgs).
-- Assorted FOSS programs: [Cryptomator], [KeyPass], [OBS] (via Nixpkgs), [OpenRGB], [RClone], and [Signal] (via Nixpkgs) messenger installation.
+- Your favorite programs via Nixpkgss.
 - Configurations: dotfiles, zsh (via Nix), terminals, [Gnome], [Git], ssh, keyboard...
 
 Note: this is an opinionated setup I personally use for software development on [NixOS](https://nixos.org). You can customize all the changes following instructions in [Overriding Defaults](#overriding-defaults).
@@ -117,7 +117,6 @@ This project was inspired by [@geerlingguy]'s [Mac Development Ansible Playbook]
 [@geerlingguy]: https://github.com/geerlingguy
 [brave]: https://brave.com/
 [contributor guide]: https://github.com/staticdev/linux-workstation-playbook/blob/main/CONTRIBUTING.md
-[cryptomator]: https://cryptomator.org/
 [debian]: https://www.debian.org/
 [docker]: https://www.docker.com/
 [dotfiles eg. repo]: https://github.com/staticdev/dotfiles-eg
@@ -127,19 +126,14 @@ This project was inspired by [@geerlingguy]'s [Mac Development Ansible Playbook]
 [gnome]: https://www.gnome.org/
 [home manager]: https://github.com/nix-community/home-manager
 [libvirtd]: https://libvirt.org/manpages/libvirtd.html
-[keypass]: https://keepass.info/
 [mac development ansible playbook]: https://github.com/geerlingguy/mac-dev-playbook
 [mit]: https://opensource.org/licenses/MIT
 [mullvad browser]: https://mullvad.net/en/browser
 [neovim]: https://github.com/neovim/neovim
 [nix]: https://nixos.org/
 [nixos download iso page]: https://nixos.org/download/#nixos-iso
 [nixvim]: https://github.com/nix-community/nixvim
-[obs]: https://obsproject.com/
 [onlyoffice]: https://github.com/ONLYOFFICE/
-[openrgb]: https://gitlab.com/CalcProgrammer1/OpenRGB
 [pep-668]: https://peps.python.org/pep-0668/
 [podman]: https://podman.io/
-[rclone]: https://rclone.org/
-[signal]: https://signal.org
 [vscodium]: https://vscodium.com/

default.config.yml

@@ -60,20 +60,5 @@ gnome_favorite_apps:
 # enable entire screen sharing
 enable_screen_sharing: false
 
-# extra installs
-## cryptomator
-install_cryptomator: false
-cryptomator_version: 1.11.1
-
-install_keypass_xc: false
-install_rclone: false
-
-## openrgb
-install_openrgb: false
-# get from https://gitlab.com/CalcProgrammer1/OpenRGB/-/tags
-openrgb_git_release: release_0.9
-openrgb_deb_version: 0.9.0
-openrgb_deb_architecture: amd64
-
 # glob pattern to ansible task files to run after all other tasks are finished.
 post_provision_tasks: []

eg/local.nix

@@ -5,6 +5,20 @@
     git = {
       userName = "Rick Sanchez";
       email = "[email protected]";
+      defaultBranch = "main";
+      createWorkspaces = true;
+      workspaces = [
+        {
+          folderName = "workspace_personal";
+          email = "[email protected]";
+          userName = "Rick Personal";
+        }
+        {
+          folderName = "workspace_work";
+          email = "[email protected]";
+          userName = "Rick Professional";
+        }
+      ];
     };
     mainUser = {
       name = "username";

main.yml

@@ -19,27 +19,9 @@
       ansible.builtin.command: killall -SIGQUIT gnome-shell
       changed_when: true
 
-    - name: Delete openrgb repo
-      ansible.builtin.file:
-        path: "{{ ansible_env.HOME }}/OpenRGB"
-        state: absent
-
-    - name: Delete openrgb generated files
-      ansible.builtin.file:
-        path: "{{ ansible_env.HOME }}/{{ item }}"
-        state: absent
-      with_items:
-        - "openrgb_{{ openrgb_deb_version }}_{{ openrgb_deb_architecture }}.buildinfo"
-        - "openrgb_{{ openrgb_deb_version }}_{{ openrgb_deb_architecture }}.changes"
-        - "openrgb_{{ openrgb_deb_version }}_{{ openrgb_deb_architecture }}.deb"
-        - "openrgb-dbgsym_{{ openrgb_deb_version }}_{{ openrgb_deb_architecture }}.deb"
-        - "OpenRGB/debian/changelog"
-
   roles:
     - role: geerlingguy.dotfiles
       when: configure_dotfiles
-    - role: stefangweichinger.ansible_rclone
-      when: install_rclone
 
   tasks:
     - name: Create SSH key
@@ -50,22 +32,6 @@
       ansible.builtin.include_tasks: tasks/sudoers.yml
       when: configure_sudoers
 
-    - name: Setup Git
-      ansible.builtin.include_tasks: tasks/git-setup.yml
-      when: setup_git
-
-    - name: Cryptomator
-      ansible.builtin.include_tasks: tasks/cryptomator.yml
-      when: install_cryptomator
-
-    - name: Install Keypass XC
-      ansible.builtin.import_tasks: tasks/keypass-xc.yml
-      when: install_keypass_xc
-
-    - name: OpenRGB
-      ansible.builtin.include_tasks: tasks/openrgb.yml
-      when: install_openrgb
-
     - name: Enable entire screen sharing
       ansible.builtin.lineinfile:
         dest: /etc/gdm3/daemon.conf

modules/sysconf.nix

@@ -1,31 +1,95 @@
 { lib, pkgs, ... }:
-{
+
+let
+  inherit (lib) mkOption types;
+in {
   options.environment.sysConf = {
-    git = lib.mkOption {
-      type = with lib.types; attrsOf str;
-      default = {
+    git = mkOption {
+      type = with types; submodule {
+        options = {
+          userName = mkOption {
+            type = str;
+            default = "Rick Sanchez";
+            description = "Git global username.";
+          };
+
+          email = mkOption {
+            type = str;
+            default = "[email protected]";
+            description = "Git global email.";
+          };
+
+          defaultBranch = mkOption {
+            type = str;
+            default = "main";
+            description = "Default Git branch name (e.g. main or master).";
+          };
+
+          createWorkspaces = mkOption {
+            type = bool;
+            default = false;
+            description = "Whether to enable per-workspace Git configs.";
+          };
+
+          workspaces = mkOption {
+            type = listOf (submodule {
+              options = {
+                folderName = mkOption {
+                  type = str;
+                  description = "Relative folder path for the Git workspace.";
+                };
+                email = mkOption {
+                  type = str;
+                  description = "Git email to use in this workspace.";
+                };
+                userName = mkOption {
+                  type = str;
+                  description = "Git username to use in this workspace.";
+                };
+              };
+            });
+            default = [ ];
+            description = "List of Git workspace configurations.";
+          };
+        };
+      };
+      default = {};
+      example = {
         userName = "Rick Sanchez";
         email = "[email protected]";
         defaultBranch = "main";
+        createWorkspaces = true;
+        workspaces = [
+          {
+            folderName = "workspace_personal";
+            email = "[email protected]";
+            userName = "Rick Personal";
+          }
+          {
+            folderName = "workspace_work";
+            email = "[email protected]";
+            userName = "Rick Professional";
+          }
+        ];
       };
-      description = "The git configs for commits: userName, email and default branch";
+      description = "Git configuration including user info and optional workspace-specific overrides.";
     };
 
-    keyboardCCedilla = lib.mkOption {
-      type = lib.types.bool;
+    keyboardCCedilla = mkOption {
+      type = types.bool;
       default = false;
       description = "Whether to enable cedilla support via GTK/QT IM modules.";
     };
-    keyboardLayout = lib.mkOption {
-      type = with lib.types; listOf (submodule {
+    keyboardLayout = mkOption {
+      type = with types; listOf (submodule {
         options = {
-          layout = lib.mkOption {
+          layout = mkOption {
             type = str;
             description = "Keyboard layout, e.g. 'us'";
             example = "us";
           };
 
-          variant = lib.mkOption {
+          variant = mkOption {
             type = nullOr str;
             default = null;
             description = "Optional keyboard variant, e.g. 'intl'";
@@ -41,8 +105,8 @@
       ];
     };
 
-    mainUser = lib.mkOption {
-      type = with lib.types; attrsOf (oneOf [str (listOf package)]);
+    mainUser = mkOption {
+      type = with types; attrsOf (oneOf [str (listOf package)]);
       default = {
         name = "rick";
         pkgs = with pkgs; [
@@ -54,16 +118,16 @@
       description = "The main user of the system: name and pkgs";
     };
 
-    systemWidePkgs = lib.mkOption {
-        type = lib.types.listOf lib.types.package;
+    systemWidePkgs = mkOption {
+        type = types.listOf types.package;
         default = with pkgs; [
             openssl
         ];
         description = "The system packages";
     };
 
-    timeZone = lib.mkOption {
-      type = lib.types.str;
+    timeZone = mkOption {
+      type = types.str;
       default = "UTC";
       description = "The system time zone";
     };

requirements.yml

@@ -2,8 +2,6 @@
 roles:
   - name: geerlingguy.dotfiles
     version: 1.2.1
-  - name: stefangweichinger.ansible_rclone
-    version: 0.1.3
 
 collections:
   - name: community.general

src/users.nix

@@ -1,24 +1,11 @@
 { config, lib, pkgs, ... }:
 
 let
-  mainUser = config.environment.sysConf.mainUser;
-  git_create_workspaces = true;
-  git_workspaces = [
-    {
-      folder_name = "workspace1";
-      email = "[email protected]";
-      username = "Dev One";
-    }
-    {
-      folder_name = "workspace2";
-      email = "[email protected]";
-      username = "Dev Two";
-    }
-  ];
+  sysConf = config.environment.sysConf;
 in
 {
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users."${mainUser.name}" = {
+  users.users."${sysConf.mainUser.name}" = {
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [
@@ -29,11 +16,11 @@ in
   };
 
   home-manager.users = {
-    "${mainUser.name}" = { ... }:
+    "${sysConf.mainUser.name}" = { ... }:
     {
       home = {
-        username = mainUser.name;
-        homeDirectory = "/home/${mainUser.name}";
+        username = sysConf.mainUser.name;
+        homeDirectory = "/home/${sysConf.mainUser.name}";
       };
 
       programs.git = {
@@ -64,26 +51,26 @@ in
           pull.rebase = true;
 
         };
-        includes = lib.optionals git_create_workspaces (
+        includes = lib.optionals sysConf.git.createWorkspaces (
           map (ws: {
-            condition = "gitdir:~/${ws.folder_name}/";
-            path = "~/${ws.folder_name}/.gitconfig";
-          }) git_workspaces
+            condition = "gitdir:~/${ws.folderName}/";
+            path = "~/${ws.folderName}/.gitconfig";
+          }) sysConf.git.workspaces
         );
       };
 
-      home.file = lib.mkIf git_create_workspaces (
+      home.file = lib.mkIf sysConf.git.createWorkspaces (
         lib.listToAttrs (map (ws:
           {
-            name = "${ws.folder_name}/.gitconfig";
+            name = "${ws.folderName}/.gitconfig";
             value = {
               text = ''
                 [user]
                   email = ${ws.email}
-                  name = ${ws.username}
+                  name = ${ws.userName}
               '';
             };
-          }) git_workspaces)
+          }) sysConf.git.workspaces)
       );
     };
   };