XDG_CONFIG_HOME/nixpkgs->XDG_CONFIG_HOME/home-manager

README.md

@@ -1,7 +1,7 @@
 # My Nix config
 
 To install, put `system` to `/etc/nixos`, put `home` to
-`~/.config/nixpkgs`.
+`~/.config/home-manager` (and `overlays.nix` to `~/.config/nixpkgs`)
 
 The reason they are separate is because I want to be able to iterate
 home config quickly, and `nixos-rebuild`'ing the entire sytem for every

home/common/i3-sway.nix

@@ -80,7 +80,7 @@ commonConfig = {
   inherit modifier;
   startup = [
     { command = builtins.toString (with pkgs; writeShellScript "init-wm" ''
-      ${callPackage ../pkgs/home-daemon {}}/bin/dotfiles-home-daemon system76-scheduler&
+      ${home-daemon}/bin/home-daemon system76-scheduler&
       ${gnome.zenity}/bin/zenity --password | (${keepassxc}/bin/keepassxc --pw-stdin ~/Nextcloud/keepass.kdbx&)
       # nextcloud and nheko need secret service access
       ${nextcloud-client}/bin/nextcloud --background&
@@ -448,7 +448,7 @@ in
     };
     terminal = config.terminalBin;
     extraConfig = {
-      modi = [ "steam:${pkgs.callPackage ../pkgs/rofi-steam-game-list {}}/bin/rofi-steam-game-list" "drun" "run" "ssh" ];
+      modi = [ "steam:${pkgs.rofi-steam-game-list}/bin/rofi-steam-game-list" "drun" "run" "ssh" ];
       icon-theme = "hicolor";
       drun-match-fields = [ "name" "generic" "exec" "keywords" ];
       show-icons = true;

home/flake.nix

@@ -37,6 +37,12 @@
               "https://cache.nixos.org"
               # "https://nixpkgs-wayland.cachix.org"
             ];
+            overlays = [
+              (self: super: import ./pkgs {
+                pkgs = super;
+              })
+              nix-gaming.overlays.default
+            ];
           };
           extraSpecialArgs = {
             # pkgs-wayland = nixpkgs-wayland.packages.${system};
@@ -44,13 +50,6 @@
           modules = [
             notlua.nixosModules.default
             nur.nixosModules.nur
-            { nixpkgs.overlays = [
-              nix-gaming.overlays.default
-              (self: super: {
-                clang_latest = super.clang_15;
-                clang-tools_latest = super.clang-tools_15;
-              })
-            ]; }
             ./hosts/nixmsi.nix
             (getPriv "nixmsi")
           ];

home/hosts/nixmsi.nix

@@ -102,7 +102,7 @@
     kdenlive
     mediainfo
     glaxnimate
-    (pkgs.callPackage ../pkgs/lalrpop { })
+    lalrpop
     # waiting until the PR gets merged
     (looking-glass-client.overrideAttrs (old: {
       version = "B6";

home/pkgs/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  lalrpop = pkgs.callPackage ./lalrpop { };
+  home-daemon = pkgs.callPackage ./home-daemon { };
+  rofi-steam-game-list = pkgs.callPackage ./rofi-steam-game-list { };
+  clang_latest = pkgs.clang_15;
+  clang-tools_latest = pkgs.clang-tools_15;
+}

home/pkgs/home-daemon/Cargo.lock

@@ -228,7 +228,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "dotfiles-home-daemon"
+name = "home-daemon"
 version = "0.1.0"
 dependencies = [
  "futures-util",

home/pkgs/home-daemon/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "dotfiles-home-daemon"
+name = "home-daemon"
 version = "0.1.0"
 edition = "2021"
 

update.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 rm -rf ./home ./system
 cp -r /etc/nixos ./system
-cp -r ~/.config/nixpkgs ./home
+cp -r ~/.config/home-manager ./home
+cp ~/.config/nixpkgs/overlays.nix ./overlays.nix