home

commit 1de4acf6e83a7b1ce6f047625c82602267a12478
parent 404fc17e2d567e0405b16e31fdd037666e936c5c
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon,  7 Sep 2020 13:07:03 +0200

systems/users: add a tekton option

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/modules/core/config.nix
 | 
3
+++
M
systems/wakasu.nix
 | 
5
+++--
M
users/vincent/default.nix
 | 
49
++++++++++++++++++++++++++++---------------------

3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/systems/modules/core/config.nix b/systems/modules/core/config.nix
@@ -13,5 +13,8 @@ in
       enable = mkEnableOption "Enable OpenShift profile";
       crc.enable = mkEnableOption "Enable CodeReady Containers";
     };
+    profiles.tekton = {
+      enable = mkEnableOption "Enable Tekton profile";
+    };
   };
 }
diff --git a/systems/wakasu.nix b/systems/wakasu.nix
@@ -55,7 +55,7 @@ in
     fsType = "vfat";
   };
 
-  swapDevices = [{ device = "/dev/disk/by-uuid/720200fc-8f27-49a7-85bb-a406b6119d31"; }];
+  swapDevices = [ { device = "/dev/disk/by-uuid/720200fc-8f27-49a7-85bb-a406b6119d31"; } ];
 
   profiles = {
     home = true;
@@ -69,6 +69,7 @@ in
     virtualization = { enable = true; nested = true; listenTCP = true; };
     kubernetes.enable = true;
     openshift.enable = true;
+    tekton.enable = true;
     yubikey.enable = true;
   };
   programs = {
@@ -100,7 +101,7 @@ in
     syncthing.guiAddress = "0.0.0.0:8384";
     smartd = {
       enable = true;
-      devices = [{ device = "/dev/nvme0n1"; }];
+      devices = [ { device = "/dev/nvme0n1"; } ];
     };
     wireguard = {
       enable = true;
diff --git a/users/vincent/default.nix b/users/vincent/default.nix
@@ -20,19 +20,19 @@ in
     uid = 1000;
     description = "Vincent Demeester";
     extraGroups = [ "wheel" "input" ]
-      ++ optionals config.profiles.desktop.enable [ "audio" "video" "lp" "scanner" "networkmanager" ]
-      ++ optionals config.networking.networkmanager.enable [ "networkmanager" ]
-      ++ optionals config.profiles.docker.enable [ "docker" ]
-      ++ optionals config.profiles.buildkit.enable [ "buildkit" ]
-      ++ optionals config.profiles.virtualization.enable [ "libvirtd" ];
+    ++ optionals config.profiles.desktop.enable [ "audio" "video" "lp" "scanner" "networkmanager" ]
+    ++ optionals config.networking.networkmanager.enable [ "networkmanager" ]
+    ++ optionals config.profiles.docker.enable [ "docker" ]
+    ++ optionals config.profiles.buildkit.enable [ "buildkit" ]
+    ++ optionals config.profiles.virtualization.enable [ "libvirtd" ];
     shell = mkIf config.programs.zsh.enable pkgs.zsh;
     isNormalUser = true;
     openssh.authorizedKeys.keys = authorizedKeys;
     # FIXME change this ?
     initialPassword = "changeMe";
     # FIXME This might be handled differently by programs.podman, …
-    subUidRanges = [{ startUid = 100000; count = 65536; }];
-    subGidRanges = [{ startGid = 100000; count = 65536; }];
+    subUidRanges = [ { startUid = 100000; count = 65536; } ];
+    subGidRanges = [ { startGid = 100000; count = 65536; } ];
   };
 
   /*
@@ -50,22 +50,29 @@ in
     ++ optionals config.profiles.dev.enable [ (import ./dev) ]
     ++ optionals config.profiles.desktop.enable [ (import ./desktop) ]
     ++ optionals config.services.xserver.desktopManager.gnome3.enable [ (import ./desktop/gnome.nix) ]
-    ++ optionals (config.networking.hostName == "wakasu") [{
-      home.packages = with pkgs; [
-        libosinfo
-        asciinema
-        oathToolkit
-      ];
-    }]
-    ++ optionals (config.profiles.laptop.enable && config.profiles.desktop.enable) [{
-      # FIXME move this in its own file
-      programs.autorandr.enable = true;
-    }]
-    ++ optionals config.profiles.docker.enable [{
-      home.packages = with pkgs; [ docker docker-compose ];
-    }]
+    ++ optionals (config.networking.hostName == "wakasu") [
+      {
+        home.packages = with pkgs; [
+          libosinfo
+          asciinema
+          oathToolkit
+        ];
+      }
+    ]
+    ++ optionals (config.profiles.laptop.enable && config.profiles.desktop.enable) [
+      {
+        # FIXME move this in its own file
+        programs.autorandr.enable = true;
+      }
+    ]
+    ++ optionals config.profiles.docker.enable [
+      {
+        home.packages = with pkgs; [ docker docker-compose ];
+      }
+    ]
     ++ optionals (isContainersEnabled && config.profiles.dev.enable) [ (import ./containers) ]
     ++ optionals config.profiles.kubernetes.enable [ (import ./containers/kubernetes.nix) ]
     ++ optionals config.profiles.openshift.enable [ (import ./containers/openshift.nix) ]
+    ++ optionals config.profiles.tekton.enable [ (import ./containers/tekton.nix) ]
   );
 }