diff options
| -rw-r--r-- | home-manager/clone-repos.nix | 10 | ||||
| -rw-r--r-- | users/timmy/default.nix | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/home-manager/clone-repos.nix b/home-manager/clone-repos.nix index 8499760..ef5bdb4 100644 --- a/home-manager/clone-repos.nix +++ b/home-manager/clone-repos.nix @@ -2,7 +2,7 @@ cfg = config.home._repos; # TODO MAKE OPTIONS server = "https://git.tjkeller.xyz/"; - docs = config.xdg.userDirs.documents; + src = "${config.xdg.userDirs.documents}/src"; dotConfig = config.xdg.configHome; bin = "$HOME/.local/bin"; cloneMissing = repo: source: target: ''clonemissing "${repo}" "${source}" "${target}"''; @@ -19,13 +19,13 @@ in { export PATH="${pkgs.git}/bin:$PATH" ${builtins.readFile ./resources/activation-scripts/clone-repos.sh} '' + lib.strings.concatStringsSep "\n" ([ - (cloneMissing "${server}dotconfig" "${docs}/config" dotConfig) - (cloneMissing "${server}nixos" "${docs}/nixos" "") + (cloneMissing "${server}dotconfig" "${src}/config" dotConfig) + (cloneMissing "${server}nixos" "${src}/nixos" "") (cloneMissing "${server}nvim" "${dotConfig}/nvim" "") (cloneMissing "${server}zsh" "${dotConfig}/zsh" "") ] ++ lib.optionals cfg.desktop [ - (cloneMissing "${server}scripts" "${docs}/scripts" bin) - (cloneMissing "${server}userscripts" "${docs}/userscripts" "") + (cloneMissing "${server}scripts" "${src}/scripts" bin) + (cloneMissing "${server}userscripts" "${src}/userscripts" "") (cloneMissing "${server}awesome" "${dotConfig}/awesome" "") ])); linkZshProfile = lib.hm.dag.entryAfter ["writeBoundary"] '' diff --git a/users/timmy/default.nix b/users/timmy/default.nix index 313449d..659efde 100644 --- a/users/timmy/default.nix +++ b/users/timmy/default.nix @@ -9,6 +9,11 @@ download = "${home}/dls"; documents = "${home}/docs"; pictures = "${home}/pics"; + # Set these as null so they're not created + music = null; + publicShare = null; + templates = null; + videos = null; }; sshKeyPaths = [ "${home}/.ssh/id_ed25519" ]; sshPublicKeyPaths = lib.map (keyPath: keyPath + ".pub") sshKeyPaths; @@ -91,8 +96,8 @@ in { # Setup gtk bookmarks gtk.gtk3.bookmarks = ( - lib.mapAttrsToList (name: path: - "file://${path} ${lib.toUpper (lib.substring 0 1 name)}${lib.substring 1 (-1) name}" # Make first letter upper case + lib.mapAttrsToList (name: dir: + lib.mkIf (dir != null) "file://${dir} ${lib.toUpper (lib.substring 0 1 name)}${lib.substring 1 (-1) name}" # Make first letter upper case ) userDirs ); }; |