Update to 23.11

rake5k · Nov 30, 2023 · 5161108 · 5161108
1 parent 1b4dcca
commit 5161108
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 19 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,14 +2,14 @@
   description = "NixOS & Home-Manager Configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
 
     flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 

diff --git a/home/base/non-nixos/default.nix b/home/base/non-nixos/default.nix
@@ -37,7 +37,7 @@ in
     };
 
     nix = {
-      package = pkgs.nix;
+      package = mkForce pkgs.nix;
       settings = {
         experimental-features = [
           "nix-command"

diff --git a/home/roles/office/default.nix b/home/roles/office/default.nix
@@ -20,7 +20,7 @@ in
 
     home.packages = with pkgs; [
       libreoffice
-      nodePackages.reveal-md
+      reveal-md
     ];
   };
 }
diff --git a/home/users/christian/shell/default.nix b/home/users/christian/shell/default.nix
@@ -72,7 +72,7 @@ in
       ssh = import ./ssh.nix;
 
       bat.enable = true;
-      exa.enable = true;
+      eza.enable = true;
       fzf.enable = true;
       jq.enable = true;
       starship.enable = true;

diff --git a/home/users/christian/shell/zsh/default.nix b/home/users/christian/shell/zsh/default.nix
@@ -20,7 +20,6 @@ in
       enable = true;
       enableAutosuggestions = true;
       enableCompletion = true;
-      enableSyntaxHighlighting = true;
       autocd = true;
       dotDir = ".config/zsh";
       dirHashes = {
@@ -68,6 +67,7 @@ in
         G = "| grep";
         UUID = "$(uuidgen | tr -d \\n)";
       };
+      syntaxHighlighting.enable = true;
     };
   };
 }
diff --git a/hosts/nix-on-droid/state-version.nix b/hosts/nix-on-droid/state-version.nix
@@ -1 +1 @@
-"23.05"
+"23.11"
diff --git a/hosts/nixos-vm/home-christian.nix b/hosts/nixos-vm/home-christian.nix
@@ -1,6 +1,22 @@
 {
   custom = {
     users.christian.enable = true;
+
+    roles = {
+      desktop.enable = true;
+      dev.enable = true;
+      gaming.enable = true;
+      graphics.enable = true;
+      homeage.enable = true;
+      mobile.enable = true;
+      multimedia = {
+        enable = true;
+        converters.enable = true;
+      };
+      office.enable = true;
+      ops.enable = true;
+      web.enable = true;
+    };
   };
 
   home.stateVersion = import ./state-version.nix;

diff --git a/hosts/nixos-vm/state-version.nix b/hosts/nixos-vm/state-version.nix
@@ -1 +1 @@
-"23.05"
+"23.11"
diff --git a/hosts/non-nixos-vm/home-christian.nix b/hosts/non-nixos-vm/home-christian.nix
@@ -2,6 +2,22 @@
   custom = {
     base.non-nixos.enable = true;
     users.christian.enable = true;
+
+    roles = {
+      desktop.enable = true;
+      dev.enable = true;
+      gaming.enable = true;
+      graphics.enable = true;
+      homeage.enable = true;
+      mobile.enable = true;
+      multimedia = {
+        enable = true;
+        converters.enable = true;
+      };
+      office.enable = true;
+      ops.enable = true;
+      web.enable = true;
+    };
   };
 
   home.stateVersion = import ./state-version.nix;

diff --git a/hosts/non-nixos-vm/state-version.nix b/hosts/non-nixos-vm/state-version.nix
@@ -1 +1 @@
-"23.05"
+"23.11"
diff --git a/nixos/base/nix/default.nix b/nixos/base/nix/default.nix
@@ -29,8 +29,6 @@
     };
   };
 
-  nixpkgs.config.allowUnfree = true;
-
   system.activationScripts.diff = {
     supportsDryActivation = true;
     text = ''