Did this actually commit?

flake.lock

@@ -23,11 +23,11 @@
         "rotate-text": "rotate-text"
       },
       "locked": {
-        "lastModified": 1627398156,
+        "lastModified": 1666806097,
-        "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=",
+        "narHash": "sha256-4/QpDoyf2I7RvhbmK15PB+qPuLYU3Lm0woUChA1fn+k=",
         "owner": "vlaci",
         "repo": "nix-doom-emacs",
-        "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff",
+        "rev": "cc495913aeb4212349392e1c68a62b8e63248123",
         "type": "github"
       },
       "original": {
@@ -182,19 +182,21 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1633291410,
+        "lastModified": 1695108154,
-        "narHash": "sha256-IxUzCGwj+s2Rn/+u0NtY36ix5I8MopMOO8Ip59PnBlw=",
+        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "382505714d10c6791a96712e0554587c75c5bf8b",
+        "rev": "07682fff75d41f18327a871088d20af2710d4744",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.05",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -202,11 +204,11 @@
     "niten-doom-config": {
       "flake": false,
       "locked": {
-        "lastModified": 1628274414,
+        "lastModified": 1684432992,
-        "narHash": "sha256-EIGqjTHcYnjVXceY1tpjaYxNmORh8NNiL2FVWCI5sBo=",
+        "narHash": "sha256-ex/H6we7BLjidBxo0n5EZ9YUflLr03sLWdf5YGsF6jU=",
-        "ref": "master",
+        "ref": "refs/heads/master",
-        "rev": "0ab1532c856ccdb6ce46c5948054279f439eb1f2",
+        "rev": "47773717b06d21004db3dea96f2329f912ef8dd3",
-        "revCount": 34,
+        "revCount": 64,
         "type": "git",
         "url": "https://git.fudo.org/niten/doom-emacs.git"
       },
@@ -249,15 +251,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1633381874,
+        "lastModified": 1699169573,
-        "narHash": "sha256-RkoVeo4K1IKqQzCI9W28UOyw4ic3Lhb3XoMDFDp7X74=",
+        "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "35b808214a1ca158a04d6980cb95cc1a77ce1f94",
+        "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
+        "ref": "nixos-23.05",
         "type": "indirect"
       }
     },
@@ -377,7 +380,8 @@
       "inputs": {
         "doom-emacs": "doom-emacs",
         "home-manager": "home-manager",
-        "niten-doom-config": "niten-doom-config"
+        "niten-doom-config": "niten-doom-config",
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "rotate-text": {

flake.nix

@@ -2,9 +2,9 @@
   description = "Fudo Home Manager Configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-21.05";
+    nixpkgs.url = "nixpkgs/nixos-23.05";
     home-manager = {
-      url = "github:nix-community/home-manager/release-21.05";
+      url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     doom-emacs.url = "github:vlaci/nix-doom-emacs";
@@ -24,5 +24,9 @@
         (import ./module.nix { inherit doom-emacs niten-doom-config; })
       ];
     };
+    mkModule = { username, user-email, home-dir, enable-gui ? false, ... }:
+      import ./niten.nix {
+        inherit username user-email home-dir enable-gui doom-emacs niten-doom-config;
+      };
   };
 }

module.nix

@@ -38,18 +38,15 @@ in {
         user-email = if (user-cfg.email != null) then
           user-cfg.email else "${username}@${config.instance.local-domain}";
         home-dir = config.users.users.${username}.home;
-      in (import user-configs.${username} {
+      in ((import user-configs.${username} {
         inherit
-          config
-          lib
-          pkgs
           doom-emacs
           niten-doom-config
           username
           user-email
           home-dir
-          enable-gui;
+          enable-gui
-      });
+      }) { inherit pkgs; });
     in mapAttrs generate-config local-users;
   };
 }

niten.nix

@@ -1,9 +1,6 @@
 {
   doom-emacs,
   niten-doom-config,
-  config,
-  lib,
-  pkgs,
   username,
   user-email,
   home-dir,
@@ -11,54 +8,56 @@
   ...
 }:
 
-with lib;
+{ pkgs, ... }:
+
+with pkgs.lib;
 let
 
+  inherit (pkgs.stdenv) isLinux;
+
   doom-emacs-package = pkgs.callPackage doom-emacs {
     doomPrivateDir = niten-doom-config;
     extraPackages = with pkgs.emacsPackages; [
       elpher
       use-package
     ];
-    emacsPackagesOverlay = final: prev: {
+    # emacsPackagesOverlay = final: prev: {
-      irony = prev.irony.overrideAttrs (esuper: {
+    #   irony = prev.irony.overrideAttrs (esuper: {
-        buildInputs = with pkgs;
+    #     buildInputs = with pkgs;
-          esuper.buildInputs ++
+    #       esuper.buildInputs ++
-          [ cmake libclang clang ];
+    #       [ cmake libclang clang ];
-      });
+    #   });
-    };
+    # };
   };
   
   gui-packages = with pkgs; [
       exodus
       firefox
-      gnome.gnome-tweaks
-      google-chrome
       imagemagick
       jq
       minecraft
-      mplayer
       nyxt
       openttd
       pv
-      redshift
       signal-desktop
       spotify
+    ] ++ (optionals isLinux [
+      gnome.gnome-tweaks
+      google-chrome
+      mplayer
+      redshift
       xclip
-    ];
+    ]);
 
   common-packages = with pkgs; [
     ant
     asdf
-    atop
     binutils
-    btrfs-progs
     bundix
     byobu
     cdrtools
     cargo
     clojure
-    clj2nix
     cmake
     curl
     enca
@@ -69,6 +68,7 @@ let
     gnutls
     gnupg
     guile
+    inetutils
     ipfs
     iptables
     jdk
@@ -83,7 +83,6 @@ let
     nix-index
     nix-prefetch-git
     nmap
-    opencv-java
     openldap
     openssl
     pciutils
@@ -93,7 +92,6 @@ let
     rustc
     sbcl
     stdenv
-    telnet
     texlive.combined.scheme-basic
     tmux
     unzip
@@ -108,7 +106,12 @@ let
     asuka
     kristall
     castor
-  ];
+  ] ++ (optionals isLinux [
+    atop
+    btrfs-progs
+    clj2nix
+    opencv-java
+  ]);
 
   ensure-directories = [ ".emacs.d/.local/etc/eshell" ];
 
@@ -134,7 +137,7 @@ in {
     "Xft.lcdfilter" = "lcddefault";
   };
 
-  services = {
+  services = mkIf isLinux {
     emacs = {
       enable = true;
       package = doom-emacs-package;
@@ -184,6 +187,10 @@ in {
   };
 
   home = {
+    inherit username;
+
+    homeDirectory = home-dir;
+
     packages = if enable-gui then (common-packages ++ gui-packages)
                else
                  common-packages;
@@ -226,6 +233,6 @@ in {
     };
   };
 
-  systemd.user.tmpfiles.rules =
+  systemd.user.tmpfiles.rules = optionals isLinux
-    map (dir: "d ${home-dir}/${dir} 700 niten - - -") ensure-directories;
+    (map (dir: "d ${home-dir}/${dir} 700 niten - - -") ensure-directories);
 }

xiaoxuan.nix

@@ -1,6 +1,7 @@
-{ config, lib, pkgs, username, user-email, home-dir, enable-gui, ... }:
+{ username, user-email, home-dir, enable-gui, ... }:
+{ pkgs, ... }:
 
-with lib; if !enable-gui then {} else {
+with pkgs.lib; if !enable-gui then {} else {
   home = {
     packages = with pkgs; [
       fcitx5-configtool