diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1af14d0..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "dotbot"] - path = dotbot - url = https://github.com/anishathalye/dotbot - ignore = dirty diff --git a/README.md b/README.md index 6944002..fa01d01 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -this is my dotfiles managed with [dotbot](https://github.com/anishathalye/dotbot/). you should be able to replicate it with just `./install`. +there are my dotfiles; managed with [home-manager](https://github.com/nix-community/home-manager/) diff --git a/conf.yml b/conf.yml deleted file mode 100644 index c96341b..0000000 --- a/conf.yml +++ /dev/null @@ -1,16 +0,0 @@ -- defaults: - link: - relink: true - create: true - -- clean: ['~'] - -- link: - ~/.config/nvim: - ~/.config/sway: - ~/.config/waybar: - ~/.config/rofi: - ~/.config/foot: - -- shell: - - [git submodule update --init --recursive, installing submodules] diff --git a/dotbot b/dotbot deleted file mode 160000 index 7202065..0000000 --- a/dotbot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 720206578a8daf1e7167200e73e314fc4b8af52e diff --git a/nix/flake.lock b/flake.lock similarity index 100% rename from nix/flake.lock rename to flake.lock diff --git a/nix/flake.nix b/flake.nix similarity index 100% rename from nix/flake.nix rename to flake.nix diff --git a/nix/home/nvim/init.lua b/home/nvim/init.lua similarity index 100% rename from nix/home/nvim/init.lua rename to home/nvim/init.lua diff --git a/nix/home/nvim/lazy-lock.json b/home/nvim/lazy-lock.json similarity index 100% rename from nix/home/nvim/lazy-lock.json rename to home/nvim/lazy-lock.json diff --git a/nix/home/nvim/lua/config/fzf.lua b/home/nvim/lua/config/fzf.lua similarity index 100% rename from nix/home/nvim/lua/config/fzf.lua rename to home/nvim/lua/config/fzf.lua diff --git a/nix/home/nvim/lua/config/hop.lua b/home/nvim/lua/config/hop.lua similarity index 100% rename from nix/home/nvim/lua/config/hop.lua rename to home/nvim/lua/config/hop.lua diff --git a/nix/home/nvim/lua/config/lsp.lua b/home/nvim/lua/config/lsp.lua similarity index 100% rename from nix/home/nvim/lua/config/lsp.lua rename to home/nvim/lua/config/lsp.lua diff --git a/nix/home/nvim/lua/config/nvim-cmp.lua b/home/nvim/lua/config/nvim-cmp.lua similarity index 100% rename from nix/home/nvim/lua/config/nvim-cmp.lua rename to home/nvim/lua/config/nvim-cmp.lua diff --git a/nix/home/nvim/lua/plugin_specs.lua b/home/nvim/lua/plugin_specs.lua similarity index 100% rename from nix/home/nvim/lua/plugin_specs.lua rename to home/nvim/lua/plugin_specs.lua diff --git a/rofi/config.rasi b/home/rofi/config.rasi similarity index 100% rename from rofi/config.rasi rename to home/rofi/config.rasi diff --git a/rofi/scripts/cliphist.sh b/home/rofi/scripts/cliphist.sh similarity index 100% rename from rofi/scripts/cliphist.sh rename to home/rofi/scripts/cliphist.sh diff --git a/sway/config b/home/sway/config similarity index 100% rename from sway/config rename to home/sway/config diff --git a/sway/scripts/remote.sh b/home/sway/scripts/remote.sh similarity index 100% rename from sway/scripts/remote.sh rename to home/sway/scripts/remote.sh diff --git a/sway/scripts/terminal.sh b/home/sway/scripts/terminal.sh similarity index 100% rename from sway/scripts/terminal.sh rename to home/sway/scripts/terminal.sh diff --git a/waybar/config b/home/waybar/config similarity index 100% rename from waybar/config rename to home/waybar/config diff --git a/waybar/style.css b/home/waybar/style.css similarity index 100% rename from waybar/style.css rename to home/waybar/style.css diff --git a/nix/home/yt/chunk.nix b/home/yt/chunk.nix similarity index 100% rename from nix/home/yt/chunk.nix rename to home/yt/chunk.nix diff --git a/nix/home/yt/common.nix b/home/yt/common.nix similarity index 100% rename from nix/home/yt/common.nix rename to home/yt/common.nix diff --git a/nix/home/yt/foot.nix b/home/yt/foot.nix similarity index 100% rename from nix/home/yt/foot.nix rename to home/yt/foot.nix diff --git a/nix/home/yt/tmux.nix b/home/yt/tmux.nix similarity index 100% rename from nix/home/yt/tmux.nix rename to home/yt/tmux.nix diff --git a/nix/home/yt/ytnix.nix b/home/yt/ytnix.nix similarity index 95% rename from nix/home/yt/ytnix.nix rename to home/yt/ytnix.nix index ee46ec4..f605fcb 100644 --- a/nix/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -129,4 +129,10 @@ border-color=#ff0000 ''; }; + + xdg.configFile = { + sway.source = ../sway; + rofi.source = ../rofi; + waybar.source = ../waybar; + }; } diff --git a/nix/home/yt/zsh/default.nix b/home/yt/zsh/default.nix similarity index 100% rename from nix/home/yt/zsh/default.nix rename to home/yt/zsh/default.nix diff --git a/nix/home/yt/zsh/p10k.zsh b/home/yt/zsh/p10k.zsh similarity index 100% rename from nix/home/yt/zsh/p10k.zsh rename to home/yt/zsh/p10k.zsh diff --git a/nix/hosts/chunk/.sops.yaml b/hosts/chunk/.sops.yaml similarity index 100% rename from nix/hosts/chunk/.sops.yaml rename to hosts/chunk/.sops.yaml diff --git a/nix/hosts/chunk/Caddyfile b/hosts/chunk/Caddyfile similarity index 100% rename from nix/hosts/chunk/Caddyfile rename to hosts/chunk/Caddyfile diff --git a/nix/hosts/chunk/default.nix b/hosts/chunk/default.nix similarity index 100% rename from nix/hosts/chunk/default.nix rename to hosts/chunk/default.nix diff --git a/nix/hosts/chunk/hardware-configuration.nix b/hosts/chunk/hardware-configuration.nix similarity index 100% rename from nix/hosts/chunk/hardware-configuration.nix rename to hosts/chunk/hardware-configuration.nix diff --git a/nix/hosts/chunk/secrets.yaml b/hosts/chunk/secrets.yaml similarity index 100% rename from nix/hosts/chunk/secrets.yaml rename to hosts/chunk/secrets.yaml diff --git a/nix/hosts/common.nix b/hosts/common.nix similarity index 100% rename from nix/hosts/common.nix rename to hosts/common.nix diff --git a/nix/hosts/ytnix/.sops.yaml b/hosts/ytnix/.sops.yaml similarity index 100% rename from nix/hosts/ytnix/.sops.yaml rename to hosts/ytnix/.sops.yaml diff --git a/nix/hosts/ytnix/default.nix b/hosts/ytnix/default.nix similarity index 100% rename from nix/hosts/ytnix/default.nix rename to hosts/ytnix/default.nix diff --git a/nix/hosts/ytnix/hardware-configuration.nix b/hosts/ytnix/hardware-configuration.nix similarity index 100% rename from nix/hosts/ytnix/hardware-configuration.nix rename to hosts/ytnix/hardware-configuration.nix diff --git a/nix/hosts/ytnix/secrets.yaml b/hosts/ytnix/secrets.yaml similarity index 100% rename from nix/hosts/ytnix/secrets.yaml rename to hosts/ytnix/secrets.yaml diff --git a/install b/install deleted file mode 100755 index a01cf8e..0000000 --- a/install +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -e - -CONFIG="conf.yml" -DOTBOT_DIR="dotbot" - -DOTBOT_BIN="bin/dotbot" -BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - -cd "${BASEDIR}" -git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive -git submodule update --init --recursive "${DOTBOT_DIR}" - -"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" diff --git a/nix/pkgs/default.nix b/pkgs/default.nix similarity index 100% rename from nix/pkgs/default.nix rename to pkgs/default.nix