Merge pull request #46 from iancleary/feat/nixos-23-05

iancleary · Jun 5, 2023 · a138d24 · a138d24
2 parents 77aee97 + 5d0f841
commit a138d24
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/nixos/README.md b/nixos/README.md
@@ -19,7 +19,7 @@ Welcome to my nixos-config!
 Edit:
 
 * update hostname
-* add user to `vboxsf` group
+* add user to `vboxsf` group (if in a virtualbox)
 * add `just` to `environment.systemPackages`
 
 Run:
@@ -47,11 +47,27 @@ sudo cp /mnt/shared/authorized_keys /etc/nixos/ssh/authorized_keys
 ## Home Manager
 
 ```bash
-sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-22.11.tar.gz home-manager
+sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
 sudo nix-channel --update
 ```
 
 It is then possible to add
 
 `imports = [ <home-manager/nixos> ];`
 to your system configuration.nix file, which will introduce a new NixOS option called home-manager.users whose type is an attribute set that maps user names to Home Manager configurations.
+
+## Upgrade to 23.05
+
+<https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module>
+
+```bash
+sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
+sudo nix-channel --update
+```
+
+<https://nixos.org/manual/nixos/stable/index.html#sec-upgrading>
+
+```bash
+sudo  nix-channel --add https://channels.nixos.org/nixos-23.05 nixos
+nixos-rebuild switch --upgrade
+```
diff --git a/nixos/hosts/nixos-framework/configuration.nix b/nixos/hosts/nixos-framework/configuration.nix
@@ -9,8 +9,8 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
 
-      ./modules/nixos-version/22.11.nix # IMPORTANT
-      # ./modules/nixos-version/23.05.nix # IMPORTANT
+      # ./modules/nixos-version/22.11.nix # IMPORTANT
+      ./modules/nixos-version/23.05.nix # IMPORTANT
 
       <home-manager/nixos>
       ./users/iancleary/bare-metal.nix

diff --git a/nixos/modules/common/zsh.nix b/nixos/modules/common/zsh.nix
@@ -11,6 +11,8 @@
     zsh
   ];
 
+  programs.zsh.enable = true;
+
   # https://github.com/nix-community/home-manager/issues/605#issuecomment-753667922
   fonts.fontconfig.enable = true;
 

diff --git a/nixos/modules/networking/openssh/enabled.nix b/nixos/modules/networking/openssh/enabled.nix
@@ -8,7 +8,10 @@
   services.openssh = {
     enable = true;
     # require public key authentication for better security
-    passwordAuthentication = false;
-    kbdInteractiveAuthentication = false;
+    settings = {
+      # https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-23.05-notable-changes
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
   };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,8 @@ @@
         zsh
       ];
+      programs.zsh.enable = true;
       # https://github.com/nix-community/home-manager/issues/605#issuecomment-753667922
       fonts.fontconfig.enable = true;
@@ Expand Down @@