Update NixOS and HM to 23.11

pdalpra · Dec 3, 2023 · df3a13c · df3a13c
1 parent 8aec671
commit df3a13c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 30 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,11 +3,11 @@
   nixConfig.bash-prompt = "\[nix-config-dev\]$ ";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.05";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     nurpkgs.url = "github:nix-community/NUR";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {

diff --git a/home/modules/cli/apps.nix b/home/modules/cli/apps.nix
@@ -54,7 +54,7 @@ in
     direnv = enableWithZshIntegration // {
       nix-direnv.enable = true;
     };
-    exa = {
+    eza = {
       enable = true;
       enableAliases = true;
     };

diff --git a/home/modules/cli/zsh.nix b/home/modules/cli/zsh.nix
@@ -11,7 +11,7 @@
   programs.zsh = {
     enable = true;
     enableCompletion = true;
-    enableSyntaxHighlighting = true;
+    syntaxHighlighting.enable = true;
     autocd = true;
 
     prezto = {

diff --git a/home/modules/dev/default.nix b/home/modules/dev/default.nix
@@ -4,6 +4,5 @@ builtins.filter builtins.pathExists [
   ./git-extra.nix
   ./go.nix
   ./jvm.nix
-  ./misc.nix
   ./rust.nix
 ]
diff --git a/home/modules/dev/misc.nix b/home/modules/dev/misc.nix
diff --git a/system/apps.nix b/system/apps.nix
@@ -2,13 +2,10 @@
 
 let
   nixSystemPath = "/nix/var/nix/profiles/system";
-  nixosListGens = pkgs.writeShellScriptBin "nixos-list-gens"
-    ''nix-env -p ${nixSystemPath} --list-generations'';
   nixosRollbackAnyGen = pkgs.writeShellScriptBin "nixos-rollback-any-gen" ''
     nix-env --switch-generation $1 -p ${nixSystemPath}
     ${nixSystemPath}/bin/switch-to-configuration switch
   '';
-  doasSudo = pkgs.writeShellScriptBin "sudo" ''doas "$@"'';
   nerdFonts = pkgs.nerdfonts.override {
     fonts = [
       "FiraCode"
@@ -34,16 +31,14 @@ in
       nix-du
       nix-index
       # Custom shell scripts
-      doasSudo
-      nixosListGens
       nixosRollbackAnyGen
     ];
   };
 
   fonts = {
-    enableDefaultFonts = true;
+    enableDefaultPackages = true;
     fontDir.enable = true;
-    fonts = [
+    packages = [
       nerdFonts
     ];
   };
@@ -66,12 +61,10 @@ in
   };
 
   security = {
-    doas = {
+    sudo = {
       enable = true;
       wheelNeedsPassword = false;
     };
-
-    sudo.enable = false;
   };
 
   services = {