WIP: Update to Nixos 23.11

TLATER · Nov 30, 2023 · a8da5b6 · a8da5b6
1 parent 444a85b
commit a8da5b6
Show file tree

Hide file tree

Showing 13 changed files with 212 additions and 182 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     # NixOS related 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";
     nixpkgs-unfree = {
       url = "github:numtide/nixpkgs-unfree";
@@ -29,7 +29,7 @@
     };
 
     aagl = {
-      url = "github:ezKEa/aagl-gtk-on-nix?rev=0c9d93bdb311f7948f9fb0e98d869316d78eec12";
+      url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -43,7 +43,7 @@
 
     # home-manager related inputs
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nurpkgs.url = "github:nix-community/NUR";

diff --git a/home-config/config/tty-applications/default.nix b/home-config/config/tty-applications/default.nix
@@ -14,7 +14,7 @@
 
   home.packages = with pkgs; [
     bat
-    exa
+    eza
     fd
     ripgrep
     screen

diff --git a/home-config/config/tty-applications/zsh.nix b/home-config/config/tty-applications/zsh.nix
@@ -46,10 +46,11 @@ in {
 
       enableAutosuggestions = true;
       enableCompletion = true;
-      enableSyntaxHighlighting = true;
       enableVteIntegration = true;
       defaultKeymap = "emacs";
 
+      syntaxHighlighting.enable = true;
+
       plugins = [
         {
           name = "bgnotify";
@@ -66,7 +67,7 @@ in {
       ];
 
       shellAliases = {
-        "ls" = "exa";
+        "ls" = "eza";
         "winetricks" = "winetricks -q";
         "pbcopy" = "xsel --clipboard --input";
         "pbpaste" = "xsel --clipboard";

diff --git a/modules/cursor-theme.nix b/modules/cursor-theme.nix
@@ -4,13 +4,13 @@
   pkgs,
   ...
 }: let
-  inherit (lib.types) string nullOr number;
+  inherit (lib.types) str nullOr number;
 in {
   options.theming = {
     cursor = {
       theme = lib.mkOption {
         default = null;
-        type = nullOr string;
+        type = nullOr str;
         description = "The default cursor theme to use. Package must be installed separately";
       };
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
       home.packages = with pkgs; [
         bat
-        exa
+        eza
         fd
         ripgrep
         screen
@@ Expand Down @@