diff --git a/flake.lock b/flake.lock index 71434e3f..7ddf4121 100644 --- a/flake.lock +++ b/flake.lock @@ -77,22 +77,6 @@ "type": "github" } }, - "dotfiles": { - "flake": false, - "locked": { - "lastModified": 1668655246, - "narHash": "sha256-V7Js99Pyg0UvP6RNg3Isv3MgCKZO9cqVxiiVa9ZZiFU=", - "owner": "foo-dogsquared", - "repo": "dotfiles", - "rev": "5862afecaf045175891550c1020c09cd2dbb32ed", - "type": "github" - }, - "original": { - "owner": "foo-dogsquared", - "repo": "dotfiles", - "type": "github" - } - }, "dream2nix": { "inputs": { "alejandra": [ @@ -665,7 +649,6 @@ "inputs": { "deploy": "deploy", "devshell": "devshell", - "dotfiles": "dotfiles", "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils", "guix-overlay": "guix-overlay", diff --git a/flake.nix b/flake.nix index 297f8ca9..5351f788 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,6 @@ # We're using these libraries for other functions. flake-utils.url = "github:numtide/flake-utils"; - # My personal dotfiles. - dotfiles.url = "github:foo-dogsquared/dotfiles"; - dotfiles.flake = false; - # Managing home configurations. home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -109,7 +105,7 @@ // import ./lib/private.nix { lib = final; }); extraArgs = { - inherit (inputs) nix-colors dotfiles; + inherit (inputs) nix-colors; inherit inputs self; # This is a variable that is used to check whether the module is diff --git a/users/home-manager/foo-dogsquared/default.nix b/users/home-manager/foo-dogsquared/default.nix index 34363466..91978449 100644 --- a/users/home-manager/foo-dogsquared/default.nix +++ b/users/home-manager/foo-dogsquared/default.nix @@ -1,4 +1,4 @@ -{ dotfiles, config, options, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: let yt-dlp-for-audio-config = pkgs.writeText "yt-dlp-for-audio-config" '' @@ -20,7 +20,7 @@ let yt-dlp-for-audio = pkgs.writeScriptBin "yt-dlp-audio" '' ${pkgs.yt-dlp}/bin/yt-dlp --config-location "${yt-dlp-for-audio-config}" $@ ''; - getDotfiles = path: "${dotfiles}/${path}"; + getDotfiles = path: config.lib.file.mkOutOfStoreSymlink "${config.home.mutableFile."library/dotfiles".path}/${path}"; musicDir = config.xdg.userDirs.music; playlistsDir = "${musicDir}/playlists"; @@ -340,4 +340,11 @@ in "nvim".source = getDotfiles "nvim"; "wezterm".source = getDotfiles "wezterm"; }; + + home.mutableFile = { + "library/dotfiles" = { + url = "https://github.com/foo-dogsquared/dotfiles.git"; + type = "git"; + }; + }; }