Update to 23.11!!

flake.lock

@@ -702,16 +702,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
+        "lastModified": 1700814205,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -968,11 +968,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1700108881,
+        "lastModified": 1701336116,
-        "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
+        "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
+        "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
         "type": "github"
       },
       "original": {
@@ -984,16 +984,16 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1699994397,
+        "lastModified": 1701263465,
-        "narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=",
+        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8",
+        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,11 +2,11 @@
   description = "nki's systems";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";

home/common.nix

@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:
 
 let
-  texlab = pkgs.unstable.texlab;
 in
 {
   imports = [
@@ -52,7 +51,7 @@ in
     ## Python
     python3
     ## Scala
-    pkgs.unstable.scala-cli
+    scala-cli
 
     # Fonts
     fantasque-sans-mono
@@ -116,7 +115,7 @@ in
     direnv.nix-direnv.enable = true;
     direnv.config.global.load_dotenv = true;
 
-    exa = {
+    eza = {
       enable = true;
       enableAliases = true;
     };

home/kagami-pc-home.nix

@@ -22,7 +22,7 @@
     inkscape # for TeX svg
 
     # Java & sbt
-    pkgs.unstable.jdk20
+    jdk21
     sbt
 
     # Gaming stuff

home/modules/linux/graphical/default.nix

@@ -53,10 +53,7 @@ in
       (if pkgs.stdenv.isAarch64 then
         pkgs.hello
       else
-        logseq.override {
+        logseq)
-          # https://github.com/electron/electron/issues/32760
-          electron = pkgs.electron_25;
-        })
 
       # (if stdenv.isAarch64 then zotero else pkgs.unstable.zotero) // kinda fucked for now from CVE
       libreoffice
@@ -72,19 +69,8 @@ in
     ]));
 
     nki.programs.discord.enable = pkgs.stdenv.isx86_64;
-    nki.programs.discord.package = (pkgs.callPackage pkgs.unstable.vesktop.override {
+    nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: {
-      electron = pkgs.electron_27;
-      nodePackages = pkgs.nodePackages // { nodejs = pkgs.nodejs; };
-    }).overrideAttrs (attrs: {
       nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest ];
-      postBuild = ''
-        pnpm build
-        # using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD
-        ./node_modules/.bin/electron-builder \
-          --dir \
-          -c.electronDist=${pkgs.electron_27}/lib/electron \
-          -c.electronVersion=${pkgs.electron_27.version}
-      '';
       postInstall = ''
         ln -s $out/bin/vencorddesktop $out/bin/discord
       '';

home/modules/linux/graphical/wayland.nix

@@ -2,7 +2,7 @@
 let
   notificationModule = { config, pkgs, lib, ... }:
     let
-      swaync = pkgs.unstable.swaynotificationcenter;
+      swaync = pkgs.swaynotificationcenter;
     in
     with lib; mkIf (config.linux.graphical.type == "wayland") {
       home.packages = [ swaync ];

home/modules/programs/my-sway/default.nix

@@ -120,7 +120,7 @@ in
 
   config.wayland.windowManager.sway = mkIf cfg.enable {
     enable = true;
-    systemdIntegration = true;
+    systemd.enable = true;
 
     config = {
       ### Inputs

modules/common/linux/default.nix

@@ -181,6 +181,8 @@ in
     ## Network configuration
     systemd.network.enable = true;
     networking.dhcpcd.enable = lib.mkForce false;
+    networking.useDHCP = false;
+    networking.useNetworkd = true;
     systemd.network.wait-online.enable = false;
     networking.hostName = cfg.networking.hostname;
     networking.wireless.iwd.enable = true;
@@ -267,6 +269,10 @@ in
       wlr.enable = true;
       # gtk portal needed to make gtk apps happy
       extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+
+      config.common.default = [ "gtk" ];
+      config.common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+      config.sway.default = [ "wlr" "gtk" ];
     };
     # D-Bus
     services.dbus.packages = with pkgs; [ gcr ];

modules/personal/fonts/default.nix

@@ -23,7 +23,7 @@ in
   imports = [ ./mounting.nix ];
   # Fonts
   config.fonts = {
-    fonts = with pkgs; [
+    packages = with pkgs; [
       noto-fonts-emoji-blob-bin
       ibm-plex
       (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
@@ -33,7 +33,7 @@ in
       corefonts
     ];
   } // (if pkgs.stdenv.isLinux then {
-    enableDefaultFonts = false;
+    enableDefaultPackages = false;
     fontconfig = {
       defaultFonts = {
         emoji = lib.mkBefore [ "Blobmoji" ];

modules/personal/fonts/mounting.nix

@@ -18,7 +18,7 @@ lib.mkIf pkgs.stdenv.isLinux {
       };
       aggregatedFonts = pkgs.buildEnv {
         name = "system-fonts";
-        paths = config.fonts.fonts;
+        paths = config.fonts.packages;
         pathsToLink = [ "/share/fonts" ];
       };
     in

overlay.nix

@@ -11,18 +11,6 @@ let
     # Typst updates really quickly.
     typst = final.unstable.typst;
     typst-lsp = final.unstable.typst-lsp;
-
-    # Sublime-music has a bug with playlists in 0.11.x
-    sublime-music =
-      if builtins.compareVersions prev.sublime-music.version "0.12" < 0
-      then final.unstable.sublime-music
-      else prev.sublime-music;
-
-    # New stuff in Kanshi 1.4.0
-    kanshi =
-      if builtins.compareVersions prev.kanshi.version "1.4.0" < 0
-      then final.callPackage final.unstable.kanshi.override { }
-      else prev.kanshi;
   };
   overlay-imported = final: prev: {
     rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}";
@@ -34,11 +22,6 @@ let
         ./overlays/conduit-remove-dbg.patch
       ];
     });
-    exa = inputs.eza.packages.${final.system}.default.overrideAttrs (attrs: {
-      postInstall = attrs.postInstall + ''
-        ln -sv $out/bin/eza $out/bin/exa
-      '';
-    });
 
     # A list of source-style inputs.
     sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs;