diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl index 098b1601..474fe54f 100644 --- a/home/.chezmoi.yaml.tmpl +++ b/home/.chezmoi.yaml.tmpl @@ -1,2 +1,2 @@ secret: - command: 'rbw-get' + command: "rbw-get" diff --git a/home/.chezmoidata.yaml.example b/home/.chezmoidata.yaml.example index c676a92f..b273671b 100644 --- a/home/.chezmoidata.yaml.example +++ b/home/.chezmoidata.yaml.example @@ -1,3 +1,3 @@ user: tstarr -network_interface: eth0 +network_interface: enp3s0 work: false diff --git a/home/.chezmoiexternal.toml b/home/.chezmoiexternal.toml index 9878e961..f4852bde 100644 --- a/home/.chezmoiexternal.toml +++ b/home/.chezmoiexternal.toml @@ -24,3 +24,19 @@ type = "git-repo" url = "git@github.com:starr-dusT/zet.git" refreshPeriod = "168h" + +### OLD ### +#[".config/xmonad/xmonad"] +# type = "git-repo" +# url = "https://github.com/xmonad/xmonad" +# refreshPeriod = "168h" +# +#[".config/xmonad/xmonad-contrib"] +# type = "git-repo" +# url = "https://github.com/xmonad/xmonad-contrib" +# refreshPeriod = "168h" +# +#[".config/xmonad/xmobar"] +# type = "git-repo" +# url = "https://codeberg.org/xmobar/xmobar" +# refreshPeriod = "168h" diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl index 579f7a91..d8faf20c 100644 --- a/home/.chezmoiignore.tmpl +++ b/home/.chezmoiignore.tmpl @@ -1,5 +1 @@ .oh-my-zsh/cache/** - -{{ if eq .chezmoi.osRelease.id "alpine"}} -.wireguard/ -{{ end }} diff --git a/home/.chezmoiscripts/run_after_chmod-ssh-keys.sh b/home/.chezmoiscripts/run_after_chmod-ssh-keys.sh deleted file mode 100644 index 156bc6c8..00000000 --- a/home/.chezmoiscripts/run_after_chmod-ssh-keys.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -if [ -f ~/.ssh/keys/github_personal ]; then - chmod 600 ~/.ssh/keys/github_personal -fi diff --git a/home/.chezmoiscripts/run_onchange_chmod-ssh-keys.sh b/home/.chezmoiscripts/run_onchange_chmod-ssh-keys.sh new file mode 100644 index 00000000..f121df3a --- /dev/null +++ b/home/.chezmoiscripts/run_onchange_chmod-ssh-keys.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +chmod 600 ~/.ssh/keys/github_personal diff --git a/home/bin/executable_alpine-install-iPhone b/home/bin/executable_alpine-install-iPhone deleted file mode 100644 index f6e8e628..00000000 --- a/home/bin/executable_alpine-install-iPhone +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# https://github.com/starr-dusT/dotfiles - -# Install edge repo -echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories -apk update - -# Install packages -apk add --virtual .packs \ - task timewarrior git go make fzf neovim nnn rbw - -# Build and install zk -mkdir -p ~/tmp -mkdir -p ~/bin -git clone https://github.com/mickael-menu/zk.git ~/tmp/zk -cd ~/tmp/zk -make -mv zk ~/bin/zk - -# Clone dotfiles -git clone git@github.com:starr-dusT/dotfiles.git ~/.local/share/chezmoi -chezmoi init -chezmoi apply -k -chezmoi apply diff --git a/home/dot_aliases b/home/dot_aliases index 026e86f9..10ac6e2e 100644 --- a/home/dot_aliases +++ b/home/dot_aliases @@ -2,7 +2,7 @@ # https://github.com/starr-dusT/dotfiles # nixos -alias nu="cd ~/.local/share/chezmoi/nixos/provision && \ +alias nu="cd ~/.local/share/chezmoi/provision && \ sudo nixos-rebuild switch --flake .#$(hostname) && \ cd -" # sway diff --git a/home/dot_config/vdirsyncer/config_calendar.tmpl b/home/dot_config/vdirsyncer/config_calendar.tmpl new file mode 100644 index 00000000..5b6c7d8e --- /dev/null +++ b/home/dot_config/vdirsyncer/config_calendar.tmpl @@ -0,0 +1,20 @@ +[general] +status_path = "~/.vdirsyncer/status/" + +[pair personal_calendar] +a = "personal_calendar_local" +b = "personal_calendar_remote" +collections = ["from a", "from b"] +metadata = ["color"] + +[storage personal_calendar_local] +type = "filesystem" +path = "~/.calendars/" +fileext = ".ics" + +[storage personal_calendar_remote] +type = "caldav" + +url = "{{ (secret "Vdirsyncer - Calendar" "url") }}" +username = "{{ (secret "Vdirsyncer - Calendar" "Username") }}" +password = "{{ (secret "Vdirsyncer - Calendar" "Password") }}" diff --git a/home/dot_config/vdirsyncer/config_contacts.tmpl b/home/dot_config/vdirsyncer/config_contacts.tmpl new file mode 100644 index 00000000..750e87c5 --- /dev/null +++ b/home/dot_config/vdirsyncer/config_contacts.tmpl @@ -0,0 +1,19 @@ +[general] +status_path = "~/.vdirsyncer/status/" + +[pair personal_contacts] +a = "personal_contacts_local" +b = "personal_contacts_remote" +collections = ["from a", "from b"] + +[storage personal_contacts_local] +type = "filesystem" +path = "~/.contacts/" +fileext = ".vcf" + +[storage personal_contacts_remote] +type = "carddav" + +url = "{{ (secret "Vdirsyncer - Contacts" "url") }}" +username = "{{ (secret "Vdirsyncer - Contacts" "Username") }}" +password = "{{ (secret "Vdirsyncer - Contacts" "Password") }}" diff --git a/img/nesasio.png b/img/nesasio.png deleted file mode 100644 index 10d1c202..00000000 Binary files a/img/nesasio.png and /dev/null differ diff --git a/provision/nixos/additional-setup.md b/provision/additional-setup.md similarity index 100% rename from provision/nixos/additional-setup.md rename to provision/additional-setup.md diff --git a/provision/alpine/alpine-install-iSH.sh b/provision/alpine/alpine-install-iSH.sh deleted file mode 100644 index 07dc6308..00000000 --- a/provision/alpine/alpine-install-iSH.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# https://github.com/starr-dusT/dotfiles - -# Install edge repo -echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories -apk update - -# Install packages -apk add --virtual .packs \ - task timewarrior git \ - fzf neovim nnn rbw \ - chezmoi openssh bash - -# Clone dotfiles -git clone https://github.com/starr-dusT/dotfiles.git ~/.local/share/chezmoi - -# Move binaries from alpine pkgs -mkdir -p ~/bin -mv ~/.local/share/chezmoi/provision/alpine/pkgs/* ~/bin diff --git a/provision/alpine/pkgs/zk b/provision/alpine/pkgs/zk deleted file mode 100755 index 022c2568..00000000 Binary files a/provision/alpine/pkgs/zk and /dev/null differ diff --git a/provision/alpine/readme.md b/provision/alpine/readme.md deleted file mode 100644 index e3fc9974..00000000 --- a/provision/alpine/readme.md +++ /dev/null @@ -1,24 +0,0 @@ -# Provision Alpine -> \*Funny joke here.\* - -Set of configs files to setup Alpine Linux on iSH. - -## Usage - -Run following to install: - -```bash -apk add curl && \ -curl https://raw.githubusercontent.com/starr-dusT/dotfiles/master/provision/alpine/alpine-install-iSH.sh | sh -``` - -Then run the following commands: - -```bash -rbw config set email -chezmoi init -chezmoi apply -k # This command will fail -bash -chezmoi apply -k # This command will fail -chezmoi apply # First time don't overwrite file -``` diff --git a/provision/nixos/flake.lock b/provision/flake.lock similarity index 100% rename from provision/nixos/flake.lock rename to provision/flake.lock diff --git a/provision/nixos/flake.nix b/provision/flake.nix similarity index 100% rename from provision/nixos/flake.nix rename to provision/flake.nix diff --git a/provision/nixos/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix similarity index 100% rename from provision/nixos/hosts/bulwark/configuration.nix rename to provision/hosts/bulwark/configuration.nix diff --git a/provision/nixos/hosts/bulwark/hardware.nix b/provision/hosts/bulwark/hardware.nix similarity index 100% rename from provision/nixos/hosts/bulwark/hardware.nix rename to provision/hosts/bulwark/hardware.nix diff --git a/provision/nixos/hosts/bulwark/home-configuration.nix b/provision/hosts/bulwark/home-configuration.nix similarity index 100% rename from provision/nixos/hosts/bulwark/home-configuration.nix rename to provision/hosts/bulwark/home-configuration.nix diff --git a/provision/nixos/hosts/bulwark/steam-deck.nix b/provision/hosts/bulwark/steam-deck.nix similarity index 100% rename from provision/nixos/hosts/bulwark/steam-deck.nix rename to provision/hosts/bulwark/steam-deck.nix diff --git a/provision/nixos/hosts/bulwark/syncthing.nix b/provision/hosts/bulwark/syncthing.nix similarity index 100% rename from provision/nixos/hosts/bulwark/syncthing.nix rename to provision/hosts/bulwark/syncthing.nix diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix similarity index 100% rename from provision/nixos/hosts/kestrel/configuration.nix rename to provision/hosts/kestrel/configuration.nix diff --git a/provision/nixos/hosts/kestrel/hardware.nix b/provision/hosts/kestrel/hardware.nix similarity index 100% rename from provision/nixos/hosts/kestrel/hardware.nix rename to provision/hosts/kestrel/hardware.nix diff --git a/provision/nixos/hosts/kestrel/home-configuration.nix b/provision/hosts/kestrel/home-configuration.nix similarity index 100% rename from provision/nixos/hosts/kestrel/home-configuration.nix rename to provision/hosts/kestrel/home-configuration.nix diff --git a/provision/nixos/hosts/kestrel/syncthing.nix b/provision/hosts/kestrel/syncthing.nix similarity index 100% rename from provision/nixos/hosts/kestrel/syncthing.nix rename to provision/hosts/kestrel/syncthing.nix diff --git a/provision/nixos/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix similarity index 100% rename from provision/nixos/hosts/torus/configuration.nix rename to provision/hosts/torus/configuration.nix diff --git a/provision/nixos/hosts/torus/hardware.nix b/provision/hosts/torus/hardware.nix similarity index 100% rename from provision/nixos/hosts/torus/hardware.nix rename to provision/hosts/torus/hardware.nix diff --git a/provision/nixos/hosts/torus/home-configuration.nix b/provision/hosts/torus/home-configuration.nix similarity index 100% rename from provision/nixos/hosts/torus/home-configuration.nix rename to provision/hosts/torus/home-configuration.nix diff --git a/provision/nixos/hosts/torus/samba-server.nix b/provision/hosts/torus/samba-server.nix similarity index 100% rename from provision/nixos/hosts/torus/samba-server.nix rename to provision/hosts/torus/samba-server.nix diff --git a/provision/nixos/hosts/torus/syncthing.nix b/provision/hosts/torus/syncthing.nix similarity index 100% rename from provision/nixos/hosts/torus/syncthing.nix rename to provision/hosts/torus/syncthing.nix diff --git a/provision/nixos/hosts/torus/wireguard-server.nix b/provision/hosts/torus/wireguard-server.nix similarity index 100% rename from provision/nixos/hosts/torus/wireguard-server.nix rename to provision/hosts/torus/wireguard-server.nix diff --git a/provision/nixos/lib/overlays.nix b/provision/lib/overlays.nix similarity index 100% rename from provision/nixos/lib/overlays.nix rename to provision/lib/overlays.nix diff --git a/provision/nixos/modules/.placeholder b/provision/modules/.placeholder similarity index 100% rename from provision/nixos/modules/.placeholder rename to provision/modules/.placeholder diff --git a/provision/nixos/modules/default.nix b/provision/modules/default.nix similarity index 100% rename from provision/nixos/modules/default.nix rename to provision/modules/default.nix diff --git a/provision/nixos/modules/desktop/default.nix b/provision/modules/desktop/default.nix similarity index 100% rename from provision/nixos/modules/desktop/default.nix rename to provision/modules/desktop/default.nix diff --git a/provision/nixos/modules/desktop/sway.nix b/provision/modules/desktop/sway.nix similarity index 100% rename from provision/nixos/modules/desktop/sway.nix rename to provision/modules/desktop/sway.nix diff --git a/provision/nixos/modules/devel/default.nix b/provision/modules/devel/default.nix similarity index 100% rename from provision/nixos/modules/devel/default.nix rename to provision/modules/devel/default.nix diff --git a/provision/nixos/modules/devel/engineering.nix b/provision/modules/devel/engineering.nix similarity index 100% rename from provision/nixos/modules/devel/engineering.nix rename to provision/modules/devel/engineering.nix diff --git a/provision/nixos/modules/devel/notes.nix b/provision/modules/devel/notes.nix similarity index 100% rename from provision/nixos/modules/devel/notes.nix rename to provision/modules/devel/notes.nix diff --git a/provision/nixos/modules/devel/python.nix b/provision/modules/devel/python.nix similarity index 100% rename from provision/nixos/modules/devel/python.nix rename to provision/modules/devel/python.nix diff --git a/provision/nixos/modules/devel/tooling.nix b/provision/modules/devel/tooling.nix similarity index 100% rename from provision/nixos/modules/devel/tooling.nix rename to provision/modules/devel/tooling.nix diff --git a/provision/nixos/modules/gaming/default.nix b/provision/modules/gaming/default.nix similarity index 100% rename from provision/nixos/modules/gaming/default.nix rename to provision/modules/gaming/default.nix diff --git a/provision/nixos/modules/gaming/steam.nix b/provision/modules/gaming/steam.nix similarity index 100% rename from provision/nixos/modules/gaming/steam.nix rename to provision/modules/gaming/steam.nix diff --git a/provision/nixos/modules/services/default.nix b/provision/modules/services/default.nix similarity index 100% rename from provision/nixos/modules/services/default.nix rename to provision/modules/services/default.nix diff --git a/provision/nixos/modules/services/jellyfin.nix b/provision/modules/services/jellyfin.nix similarity index 100% rename from provision/nixos/modules/services/jellyfin.nix rename to provision/modules/services/jellyfin.nix diff --git a/provision/nixos/modules/services/peripherals.nix b/provision/modules/services/peripherals.nix similarity index 100% rename from provision/nixos/modules/services/peripherals.nix rename to provision/modules/services/peripherals.nix diff --git a/provision/nixos/modules/services/samba-client.nix b/provision/modules/services/samba-client.nix similarity index 100% rename from provision/nixos/modules/services/samba-client.nix rename to provision/modules/services/samba-client.nix diff --git a/provision/nixos/modules/services/virt-manager.nix b/provision/modules/services/virt-manager.nix similarity index 100% rename from provision/nixos/modules/services/virt-manager.nix rename to provision/modules/services/virt-manager.nix diff --git a/provision/nixos/modules/system/default.nix b/provision/modules/system/default.nix similarity index 100% rename from provision/nixos/modules/system/default.nix rename to provision/modules/system/default.nix diff --git a/provision/nixos/modules/system/ssh.nix b/provision/modules/system/ssh.nix similarity index 100% rename from provision/nixos/modules/system/ssh.nix rename to provision/modules/system/ssh.nix diff --git a/provision/nixos/modules/system/terminal.nix b/provision/modules/system/terminal.nix similarity index 100% rename from provision/nixos/modules/system/terminal.nix rename to provision/modules/system/terminal.nix diff --git a/provision/nixos/modules/system/wireguard-client.nix b/provision/modules/system/wireguard-client.nix similarity index 100% rename from provision/nixos/modules/system/wireguard-client.nix rename to provision/modules/system/wireguard-client.nix diff --git a/provision/nixos/overlays/.placeholder b/provision/overlays/.placeholder similarity index 100% rename from provision/nixos/overlays/.placeholder rename to provision/overlays/.placeholder diff --git a/provision/nixos/overlays/default.nix b/provision/overlays/default.nix similarity index 100% rename from provision/nixos/overlays/default.nix rename to provision/overlays/default.nix diff --git a/provision/nixos/overlays/nnn.nix b/provision/overlays/nnn.nix similarity index 100% rename from provision/nixos/overlays/nnn.nix rename to provision/overlays/nnn.nix diff --git a/provision/nixos/pkgs/.placeholder b/provision/pkgs/.placeholder similarity index 100% rename from provision/nixos/pkgs/.placeholder rename to provision/pkgs/.placeholder diff --git a/provision/nixos/pkgs/advcpmv.nix b/provision/pkgs/advcpmv.nix similarity index 100% rename from provision/nixos/pkgs/advcpmv.nix rename to provision/pkgs/advcpmv.nix diff --git a/provision/nixos/pkgs/sway-scratchpad.nix b/provision/pkgs/sway-scratchpad.nix similarity index 100% rename from provision/nixos/pkgs/sway-scratchpad.nix rename to provision/pkgs/sway-scratchpad.nix diff --git a/provision/nixos/pkgs/taskopen.nix b/provision/pkgs/taskopen.nix similarity index 100% rename from provision/nixos/pkgs/taskopen.nix rename to provision/pkgs/taskopen.nix diff --git a/provision/nixos/readme.md b/provision/readme.md similarity index 100% rename from provision/nixos/readme.md rename to provision/readme.md diff --git a/readme.md b/readme.md index 2213c857..bd0bc5b7 100644 --- a/readme.md +++ b/readme.md @@ -6,20 +6,15 @@ someday, but I probably won't. ## Usage -Dotfiles are managed with chezmoi and located in the `home` folder. - -The NixOS flake contained in `provision/nixos` contains nix code for installing -and configuring my various NixOS based machines. See the provision [readme](./provision/readme.md) +Dotfiles are managed with chezmoi and located in the `home` folder. The NixOS +flake contained in `provision` contains nix code for installing and configuring +my various NixOS based machines. See the provision [readme](./provision/readme.md) for information on initial installation. -The `provision/alpine` folder contains a script to install and configure [iSH](https://ish.app/) -for use with zk and taskwarrior. - ## Managed Machines | | Name | Role | Description | |---|---|---|---| -| | [Kestrel](./provision/hosts/kestrel/) | Primary desktop | Nixos based main machine that does it all gaming, programming, 3D modelling, etc. | -| | [Torus](./provision/hosts/torus/) | Home server | NixOS based home server for storage, hosting machine backups, and running services like Jellyfin. | +| | [Kestrel](./provision/hosts/kestrel/) | Primary desktop | Main machine that does it all gaming, programming, 3D modelling, etc. | +| | [Torus](./provision/hosts/torus/) | Home server | Primary home server for storage, hosting machine backups, and running services like Jellyfin. | | | [Bulwark](./provision/hosts/bulwark/) | Steam Deck | NixOS based Steam Deck that can has my linux niceties and acts like a Steam Deck using the great [Jovian Nixos](https://github.com/Jovian-Experiments/Jovian-NixOS). | -| | [Nesasio](./provision/alpine/) | Phone CLI | iSH config for zk and taskwarrior. |