fix(nixos): Fix build errors

mrjones2014 · Jan 27, 2024 · 6529b89 · 6529b89
1 parent e20e08b
commit 6529b89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/home-manager/modules/ssh.nix b/home-manager/modules/ssh.nix
@@ -3,7 +3,7 @@
     enable = true;
     forwardAgent = true;
     matchBlocks = {
-      "nixos-server" = { port = "6969"; };
+      "nixos-server" = { port = 6969; };
       "gitlab.1password.io" = {
         port = 2227;
         hostname = "ssh.gitlab.1password.io";

diff --git a/hosts/pc/default.nix b/hosts/pc/default.nix
@@ -1,17 +1,18 @@
 { pkgs, config, ... }: {
   networking.hostName = "nixos-pc";
   imports = [
-    ./desktop_environment.nix
-    ./_1password.nix
-    ./allowed-unfree.nix
+    ../../nixos-modules/desktop_environment.nix
+    ../../nixos-modules/_1password.nix
+    ../../nixos-modules/allowed-unfree.nix
     ./hardware-configuration.nix
   ];
   users.users.mat = {
     shell = pkgs.fish;
     isNormalUser = true;
     description = "mat";
-    # generated via: nix-shell -p pkgs.openssl --run "openssl passwd -1"
-    hashedPassword = "$1$kWL6uedh$2zhN6tfwSD8dhWG5jONJK.";
+    # generated by `mkpasswd`
+    hashedPassword =
+      "$y$j9T$L.RrmE3CRSB.lQayiw2ZN/$vA4XkSR13yL016t3HaZ11uCN/sCmXqBcuUcSBxMjiPD";
     home = "/home/mat";
     extraGroups = [ "networkmanager" "wheel" ];
   };

diff --git a/hosts/server/default.nix b/hosts/server/default.nix
@@ -39,8 +39,9 @@
       mat = {
         shell = pkgs.fish;
         isNormalUser = true;
-        # generated via: nix-shell -p pkgs.openssl --run "openssl passwd -1"
-        hashedPassword = "$1$kWL6uedh$2zhN6tfwSD8dhWG5jONJK.";
+        # generated by `mkpasswd`
+        hashedPassword =
+          "$y$j9T$L.RrmE3CRSB.lQayiw2ZN/$vA4XkSR13yL016t3HaZ11uCN/sCmXqBcuUcSBxMjiPD";
         home = "/home/mat";
         extraGroups = [ "wheel" ];
         openssh.authorizedKeys.keys = [