home

commit 1239e1692dabe5c61436019911724f6282138357
parent efe661cfda2676e272780c8ecc9a294fd485a67d
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 16 Oct 2020 15:06:17 +0200

systems/hokkaido.nix: fmt

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

Diffstat:
M
Makefile
 | 
6
+++---
M
pkgs/oc/default.nix
 | 
2
+-
M
systems/naruhodo.nix
 | 
14
++++++--------
M
users/vincent/containers/openshift.nix
 | 
2
+-

4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ update:
 .PHONY: secrets
 secrets:
 	mkdir -p secrets
-	cp -Rv $(SYNCDIR)/* secrets/
+	-cp -Rv $(SYNCDIR)/* secrets/
 
 .PHONY: assets
 assets:
@@ -40,7 +40,7 @@ home-switch: secrets
 	home-manager -f home.nix switch
 
 .PHONY: build
-build: secrets setup
+build: secrets
 	./hack/system build
 
 .PHONY: nixos-dry-build
@@ -48,7 +48,7 @@ dry-build: secrets setup
 	./hack/system dry-build
 
 .PHONY: switch
-switch: secrets setup
+switch: secrets
 	./hack/system switch
 
 .PHONY: install-hooks
diff --git a/pkgs/oc/default.nix b/pkgs/oc/default.nix
@@ -39,7 +39,7 @@ rec {
     };
 
   oc_4_5 = makeOverridable ocGen {
-    version = "4.5.2";
+    version = "4.5.14";
     sha256 = "1lryxvh4ds8fzk6bivigknbqxwlv93xjq111mlgi3q0qz0sh7f2y";
   };
   oc_4_4 = makeOverridable ocGen {
diff --git a/systems/naruhodo.nix b/systems/naruhodo.nix
@@ -21,9 +21,10 @@ in
   ];
 
   fileSystems."/" =
-    { device = "/dev/mapper/root";
+    {
+      device = "/dev/mapper/root";
       fsType = "ext4";
-      options = ["noatime" "discard"];
+      options = [ "noatime" "discard" ];
     };
 
   boot.initrd.luks.devices = {
@@ -35,13 +36,13 @@ in
   };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0101-68DE";
+    {
+      device = "/dev/disk/by-uuid/0101-68DE";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/aff86817-55ae-47ed-876a-e5a027b560ba"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/aff86817-55ae-47ed-876a-e5a027b560ba"; }];
 
   networking = {
     hostName = hostname;
@@ -67,8 +68,6 @@ in
   environment.systemPackages = with pkgs; [ virtmanager ];
 
   services = {
-    # FIXME re-generate naruhodo key
-    /*
     wireguard = {
       enable = true;
       ips = ips;
@@ -76,7 +75,6 @@ in
       endpointPort = endpointPort;
       endpointPublicKey = endpointPublicKey;
     };
-    */
   };
 
   virtualisation.podman.enable = true;
diff --git a/users/vincent/containers/openshift.nix b/users/vincent/containers/openshift.nix
@@ -4,7 +4,7 @@
   home.file.".local/share/applications/chos4.desktop".source = ./chos4.desktop;
   home.packages = with pkgs; [
     #my.crc
-    my.oc
+    #my.oc
     #my.openshift-install
     #my.operator-sdk
   ];