revert changes for iSH

home/.chezmoi.yaml.tmpl

@@ -1,2 +1,2 @@
 secret:
-  command: 'rbw-get'
+  command: "rbw-get"

home/.chezmoidata.yaml.example

@@ -1,3 +1,3 @@
 user: tstarr
-network_interface: eth0
+network_interface: enp3s0
 work: false

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"

home/.chezmoiignore.tmpl

@@ -1,5 +1 @@
 .oh-my-zsh/cache/**
-
-{{ if eq .chezmoi.osRelease.id "alpine"}}
-.wireguard/
-{{ end }}

home/.chezmoiscripts/run_after_chmod-ssh-keys.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -f ~/.ssh/keys/github_personal ]; then
-    chmod 600 ~/.ssh/keys/github_personal
-fi

home/.chezmoiscripts/run_onchange_chmod-ssh-keys.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+chmod 600 ~/.ssh/keys/github_personal

home/bin/executable_alpine-install-iPhone

@@ -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

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

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") }}"

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") }}"

provision/alpine/alpine-install-iSH.sh

@@ -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 

provision/alpine/readme.md

@@ -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 <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
-```

readme.md

@@ -6,20 +6,15 @@ someday, but I probably won't.
 
 ## Usage
 
-Dotfiles are managed with chezmoi and located in the `home` folder. 
+Dotfiles are managed with chezmoi and located in the `home` folder. The NixOS 
-
+flake contained in `provision` contains nix code for installing and configuring 
-The NixOS flake contained in `provision/nixos` contains nix code for installing 
+my various NixOS based machines. See the provision [readme](./provision/readme.md)
-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 |
 |---|---|---|---|
-| <img src="./img/kestrel.png" width="100"> | [Kestrel](./provision/hosts/kestrel/) | Primary desktop | Nixos based main machine that does it all gaming, programming, 3D modelling, etc. |
+| <img src="./img/kestrel.png" width="100"> | [Kestrel](./provision/hosts/kestrel/) | Primary desktop | Main machine that does it all gaming, programming, 3D modelling, etc. |
-| <img src="./img/torus.png" width="100"> | [Torus](./provision/hosts/torus/) | Home server |  NixOS based home server for storage, hosting machine backups, and running services like Jellyfin. |
+| <img src="./img/torus.png" width="100"> | [Torus](./provision/hosts/torus/) | Home server | Primary home server for storage, hosting machine backups, and running services like Jellyfin. |
 | <img src="./img/bulwark.png" width="100"> | [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). |
-| <img src="./img/nesasio.png" width="100"> | [Nesasio](./provision/alpine/) | Phone CLI | iSH config for zk and taskwarrior. |