Migrate from 23.05 -> 23.11

Sigmanificient · Dec 21, 2023 · 6496489 · 6496489
1 parent 0f05fb3
commit 6496489
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,14 +2,14 @@
   description = "Sigma dotfiles";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     ecsls.url = "github:Sigmapitech-meta/ecsls";
     hosts.url = "github:StevenBlack/hosts";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

diff --git a/home/default.nix b/home/default.nix
@@ -36,8 +36,8 @@
 
     packages =
       let
-        figma-linux-wrap = pkgs.figma-linux.overrideAttrs (prev: {
-          nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.wrapGAppsHook ];
+        figma-linux-wrap = with pkgs; figma-linux.overrideAttrs (prev: {
+          nativeBuildInputs = prev.nativeBuildInputs ++ [ wrapGAppsHook ];
         });
 
       in

diff --git a/home/zsh/default.nix b/home/zsh/default.nix
@@ -4,7 +4,7 @@
     enable = true;
     enableAutosuggestions = true;
     enableCompletion = true;
-    enableSyntaxHighlighting = true;
+    syntaxHighlighting.enable = true;
 
     plugins = [
       {

diff --git a/system/default.nix b/system/default.nix
@@ -41,14 +41,6 @@
       allowUnfree = true;
       pulseaudio = true;
     };
-
-    overlays = [
-      (_: super: {
-        nix-direnv = super.nix-direnv.override {
-          enableFlakes = true;
-        };
-      })
-    ];
   };
 
   networking = {
@@ -157,7 +149,6 @@
       windowManager.qtile = {
         enable = true;
         backend = "x11";
-        extraPackages = pypkgs: [ pypkgs.qtile-extras ];
       };
     };
 
@@ -171,8 +162,11 @@
     initialPassword = "hello";
   };
 
-  fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+  fonts.packages = with pkgs; let
+    jetbrains-mono-nerd-font = (nerdfonts.override
+      { fonts = [ "JetBrainsMono" ]; });
+  in [
+    jetbrains-mono-nerd-font
     dina-font
     fira-code
     fira-code-symbols
@@ -234,13 +228,11 @@
   };
 
   qt.style = "adwaita-dark";
-  xdg = {
-    portal = {
-      enable = true;
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-gtk
-      ];
-    };
+  xdg.portal = {
+    enable = true;
+    config.common.default = "*";
+    extraPortals = [
+      pkgs.xdg-desktop-portal-kde
+    ];
   };
 }