From 28e94cecc4b892e1b9b2c8f5c880f9a9a10898fb Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 16 Mar 2023 17:32:24 +0100 Subject: [PATCH 1/8] Add monero-wallet cask --- macx-resources/Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/macx-resources/Brewfile b/macx-resources/Brewfile index cc5c171..70e69ea 100644 --- a/macx-resources/Brewfile +++ b/macx-resources/Brewfile @@ -100,6 +100,7 @@ cask "transmit" cask "gpg-suite" cask "tor-browser" cask "balenaetcher" +cask "monero-wallet" ## development cask "hex-fiend" -- 2.45.1 From aff65eb0472ddca2b6deca2eff501122e944ed61 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 16 Mar 2023 20:43:45 +0100 Subject: [PATCH 2/8] Add development app store apps --- macx-resources/Brewfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/macx-resources/Brewfile b/macx-resources/Brewfile index 70e69ea..1c103f4 100644 --- a/macx-resources/Brewfile +++ b/macx-resources/Brewfile @@ -154,6 +154,10 @@ cask "telegram-desktop" ## cli so we can actually manage these brew "mas" +## Development +mas "Xcode", id: 497799835 +mas "Apple Configurator", id: 1037126344 + ## iLife mas "Keynote", id: 409183694 mas "Numbers", id: 409203825 -- 2.45.1 From 959c25363dbb546be9a723248119e7fa322b348e Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 16 Mar 2023 23:17:38 +0100 Subject: [PATCH 3/8] Add rocky.sh --- rocky.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 rocky.sh diff --git a/rocky.sh b/rocky.sh new file mode 100644 index 0000000..c85d8eb --- /dev/null +++ b/rocky.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +dnf install epel-release wget git nano zsh -y +sudo useradd -md /home/zotan -s /bin/zsh -UG sudo zotan +sudo -u zotan "mkdir /home/zotan/.ssh" +sudo -u zotan "wget -O /home/zotan/.ssh/authorized_keys share.zotan.services/authorized_keys" +sudo -u zotan "curl share.zotan.services/prezto.sh -L | zsh" +sudo -iu zotan -- 2.45.1 From 54642a21cf2809f989173e3bd5132f5bcc0f9480 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 17 Mar 2023 00:08:28 +0100 Subject: [PATCH 4/8] Fix install --- rocky.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rocky.sh b/rocky.sh index c85d8eb..4b7d73b 100644 --- a/rocky.sh +++ b/rocky.sh @@ -1,6 +1,8 @@ #!/bin/bash -dnf install epel-release wget git nano zsh -y +sudo dnf install epel-release wget git nano zsh -y +sudo groupadd sudo +sudo bash -c 'echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers' sudo useradd -md /home/zotan -s /bin/zsh -UG sudo zotan sudo -u zotan "mkdir /home/zotan/.ssh" sudo -u zotan "wget -O /home/zotan/.ssh/authorized_keys share.zotan.services/authorized_keys" -- 2.45.1 From 840f0044defb6e1a3bdc7d91209dd406eeb9185e Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 17 Mar 2023 00:09:37 +0100 Subject: [PATCH 5/8] Fix prezto url --- rocky.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocky.sh b/rocky.sh index 4b7d73b..773485b 100644 --- a/rocky.sh +++ b/rocky.sh @@ -6,5 +6,5 @@ sudo bash -c 'echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers' sudo useradd -md /home/zotan -s /bin/zsh -UG sudo zotan sudo -u zotan "mkdir /home/zotan/.ssh" sudo -u zotan "wget -O /home/zotan/.ssh/authorized_keys share.zotan.services/authorized_keys" -sudo -u zotan "curl share.zotan.services/prezto.sh -L | zsh" +sudo -u zotan "curl ztn.sh/prezto.sh -L | zsh" sudo -iu zotan -- 2.45.1 From dea32fe285da64cd0511dc91db92833d9e874cdd Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 17 Mar 2023 00:11:40 +0100 Subject: [PATCH 6/8] Fix sudo calls --- rocky.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rocky.sh b/rocky.sh index 773485b..ddbb8eb 100644 --- a/rocky.sh +++ b/rocky.sh @@ -4,7 +4,7 @@ sudo dnf install epel-release wget git nano zsh -y sudo groupadd sudo sudo bash -c 'echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers' sudo useradd -md /home/zotan -s /bin/zsh -UG sudo zotan -sudo -u zotan "mkdir /home/zotan/.ssh" -sudo -u zotan "wget -O /home/zotan/.ssh/authorized_keys share.zotan.services/authorized_keys" -sudo -u zotan "curl ztn.sh/prezto.sh -L | zsh" +sudo -u zotan mkdir /home/zotan/.ssh +sudo -u zotan wget -O /home/zotan/.ssh/authorized_keys share.zotan.services/authorized_keys +sudo -u zotan bash -c 'curl ztn.sh/prezto.sh -L | zsh' sudo -iu zotan -- 2.45.1 From 0df83365bff44c767807c46e0c8c5b6c0d9207c5 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 17 Mar 2023 02:52:54 +0100 Subject: [PATCH 7/8] Fixes --- archx.sh | 2 +- macx.sh | 4 ++-- rocky.sh | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/archx.sh b/archx.sh index 34360bc..1ba9eb6 100644 --- a/archx.sh +++ b/archx.sh @@ -470,7 +470,7 @@ postinstall_cli(){ chsh -s /bin/zsh $user chsh -s /bin/zsh root - wget share.zotan.services/prezto.sh -O /tmp/prezto.sh + wget ztn.sh/prezto.sh -O /tmp/prezto.sh sudo -u $user zsh /tmp/prezto.sh zsh /tmp/prezto.sh diff --git a/macx.sh b/macx.sh index 1f64279..45d477d 100644 --- a/macx.sh +++ b/macx.sh @@ -62,7 +62,7 @@ curl -L ztn.sh/macx-resources/zshrc >> ~/.zshrc echo "Installing prezto" rm ~/.zprofile -curl -L share.zotan.services/prezto.sh | zsh +curl -L ztn.sh/prezto.sh | zsh (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> ~/.zprofile #### @@ -76,4 +76,4 @@ echo echo "Please download and install them manually." echo echo "After that, please reboot to make sure everything is applied." -echo \ No newline at end of file +echo diff --git a/rocky.sh b/rocky.sh index ddbb8eb..efef6a1 100644 --- a/rocky.sh +++ b/rocky.sh @@ -1,10 +1,12 @@ #!/bin/bash -sudo dnf install epel-release wget git nano zsh -y +sudo dnf install epel-release wget git nano zsh sqlite -y sudo groupadd sudo sudo bash -c 'echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers' sudo useradd -md /home/zotan -s /bin/zsh -UG sudo zotan sudo -u zotan mkdir /home/zotan/.ssh sudo -u zotan wget -O /home/zotan/.ssh/authorized_keys share.zotan.services/authorized_keys sudo -u zotan bash -c 'curl ztn.sh/prezto.sh -L | zsh' -sudo -iu zotan + +# Don't automatically clear the terminal on logout +sudo sed -i '/^\s*clear\s*$/d' /etc/zlogout -- 2.45.1 From fe306a0e193d2ed9d6d667d927ef90accb2b0a68 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 20 Apr 2023 17:07:10 +0200 Subject: [PATCH 8/8] Add sublime-merge --- macx-resources/Brewfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/macx-resources/Brewfile b/macx-resources/Brewfile index 1c103f4..b813c08 100644 --- a/macx-resources/Brewfile +++ b/macx-resources/Brewfile @@ -80,6 +80,7 @@ cask "topnotch" cask "bartender" cask "rectangle" cask "sublime-text" +cask "sublime-merge" cask "google-chrome" ## messengers @@ -166,4 +167,4 @@ mas "Pages", id: 409201541 ## Other mas "Amphetamine", id: 937984704 mas "Navigator", id: 1590354537 -mas "Reeder", id: 1529448980 \ No newline at end of file +mas "Reeder", id: 1529448980 -- 2.45.1