Set-up marabethia as a development machine

machines/marabethia/default.nix

@@ -82,6 +82,7 @@
         rootPool = "zroot";
       };
     };
+    development.enable = true;
     games = {
       particles.server = true;
       tetris.server = true;

modules/nixos/development/android/default.nix

@@ -22,6 +22,6 @@
       zfs.homeLinks = [{ path = ".android"; type = "cache"; }];
     };
     programs.adb.enable = true;
-    users.users.charlotte.extraGroups = [ "adbusers" ];
+    users.users.charlotte.extraGroups = [ "adbusers" "dialout" "uucp" ];
   };
 }

modules/nixos/development/default.nix

@@ -4,13 +4,13 @@
   imports = [
     ./android
     ./docker
-    ./git
   ];
 
   config = lib.mkIf config.chvp.development.enable {
-    chvp.development.docker.enable = lib.mkDefault true;
+    chvp = {
-
+      base.zfs.homeLinks = [{ path = "repos"; type = "cache"; }];
-    users.users.charlotte.extraGroups = [ "dialout" "uucp" ];
+      development.docker.enable = lib.mkDefault true;
+    };
 
     boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
   };

modules/nixos/development/git/default.nix

@@ -1,6 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home-manager.users.charlotte.programs.git = lib.mkIf config.chvp.development.git.enable {
-  };
-}

modules/nixos/graphical/xdg/default.nix

@@ -13,7 +13,6 @@
       { path = "downloads"; type = "cache"; }
       { path = "music"; type = "data"; }
       { path = "pictures"; type = "cache"; }
-      { path = "repos"; type = "cache"; }
       { path = "templates"; type = "data"; }
       { path = "videos"; type = "data"; }
     ];

modules/shared/development/git/default.nix

@@ -65,31 +65,55 @@ in
       ''
     ];
     home-manager.users.${username} = {
-      programs.git = {
+      programs = {
-        enable = true;
+        gh = {
-        lfs.enable = true;
+          enable = true;
-        extraConfig = {
+          extensions = [
-          branch.autosetuprebase = "always";
+            (pkgs.buildGoModule {
-          commit.gpgSign = true;
+              pname = "gh-skyline";
-          github.user = "chvp";
+              version = "0.1.2";
-          gpg.format = "ssh";
+              src = pkgs.fetchFromGitHub {
-          merge.conflictStyle = "diff3";
+                owner = "github";
-          pull.rebase = true;
+                repo = "gh-skyline";
-          rebase.autoStash = true;
+                tag = "v0.1.2";
-          rerere.enabled = true;
+                hash = "sha256-fe2mM46DM7LhbZP2QhcwkXUWp8o4iY/LLgALJ+H60P0=";
-          tag.gpgSign = true;
+              };
-          user.signingKey = sshKeyFile;
+              vendorHash = "sha256-rfv9KTTWs68pqSdgWo9dIn+PTe+77ZMOEhG0P37QwKo=";
+
+              ldflags = [
+                "-s"
+                "-w"
+                "-X main.Version=0.1.2"
+              ];
+            })
+          ];
+        };
+        git = {
+          enable = true;
+          lfs.enable = true;
+          extraConfig = {
+            branch.autosetuprebase = "always";
+            commit.gpgSign = true;
+            github.user = "chvp";
+            gpg.format = "ssh";
+            merge.conflictStyle = "diff3";
+            pull.rebase = true;
+            rebase.autoStash = true;
+            rerere.enabled = true;
+            tag.gpgSign = true;
+            user.signingKey = sshKeyFile;
+          };
+          ignores = [
+            ".DS_Store"
+            ".data"
+            ".direnv"
+            ".envrc"
+            ".idea"
+            ".dir-locals.el"
+          ];
+          userEmail = config.chvp.development.git.email;
+          userName = "Charlotte Van Petegem";
         };
-        ignores = [
-          ".DS_Store"
-          ".data"
-          ".direnv"
-          ".envrc"
-          ".idea"
-          ".dir-locals.el"
-        ];
-        userEmail = config.chvp.development.git.email;
-        userName = "Charlotte Van Petegem";
       };
     };
   };