Fixed some issues, adjustments for artix

.gitignore

@@ -1,11 +1,5 @@
-.gitsecret/keys/random_seed
-!*.secret
-config/msmtp/config
-config/isync/mbsyncrc
-config/calcurse/caldav/config
-config/wakatime/wakatime.cfg
-config/zsh/secret
-config/nextcloud/nextcloud
-config/spotifyd/spotifyd.conf
-.ccls-cache
-**/.ccls-cache
+*.otf
+*.ttf
+
+*.otf*
+*.ttf*

arch-setup/chroot.sh

@@ -48,6 +48,7 @@ if [ ! -f "/tmp/.blackarch" ]; then
     /tmp/strap.sh
 
     if [ -f "/install/artix" ]; then
+        echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist-arch" >> /etc/pacman.conf
         echo -e "\n[lib32]\nInclude = /etc/pacman.d/mirrorlist\n\n[options]\nILoveCandy\nTotalDownload\nColor" >> /etc/pacman.conf
     else
         echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist\n\n[options]\nILoveCandy\nTotalDownload\nColor" >> /etc/pacman.conf
@@ -200,9 +201,7 @@ EOF
 fi
 
 mkdir -p /etc/sudoers.d
-echo "Defaults env_reset,pwfeedback" >> /etc/sudoers.d/wheel
 echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/nopwd
-echo "$username $hostname =NOPASSWD: /sbin/shutdown ,/sbin/halt,/sbin/reboot,/sbin/hibernate, /bin/pacman -Syyuw --noconfirm" > /etc/sudoers.d/wheel
 
 
 sudo -u $username bash -c "git clone https://aur.archlinux.org/yay.git /tmp/yay"
@@ -222,29 +221,26 @@ if [ "$dotfiles" = "y" ]; then
     sudo -u $username bash -c "git clone --recurse-submodules https://github.com/theFr1nge/dotfiles.git ~/.dotfiles"
     sudo -u $username bash -c "(cd ~/.dotfiles; ./install.sh)"
     clear
-    git clone https://github.com/adi1090x/plymouth-themes.git /tmp/pthemes
+fi
+git clone https://github.com/adi1090x/plymouth-themes.git /tmp/pthemes
 cat << EOF > /etc/plymouth/plymouthd.conf
 [Daemon]
 Theme=sphere
 ShowDelay=0
 DeviceTimeout=8
 EOF
-    cp -r /tmp/pthemes/pack_4/sphere /usr/share/plymouth/themes
-    clear
-fi
-
-
+cp -r /tmp/pthemes/pack_4/sphere /usr/share/plymouth/themes
+clear
 
 echo -e "/boot/EFI/refind\n2\n2" | sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/bobafetthotmail/refind-theme-regular/master/install.sh)"
 
 if [ -f "/install/artix" ]; then
-    echo "Manually enable services, not implemented"
+    sudo rc-update add cronie
+    sudo rc-update add acpi
+    sudo rc-update add dbus
 else
     systemctl enable NetworkManager
-    systemctl enable ly
-    systemctl enable fstrim.timer
     systemctl enable cronie
-    systemctl enable bluetooth
 fi
 
 clear
@@ -259,7 +255,9 @@ pacman --noconfirm -R nano # uninstall nano, eww
 clear
 
 rm -rf /etc/sudoers.d/nopwd
+echo "Defaults env_reset,pwfeedback" > /etc/sudoers.d/wheel
 echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers.d/wheel
+echo "$username $hostname =NOPASSWD: /sbin/shutdown ,/sbin/halt,/sbin/reboot,/sbin/hibernate, /bin/pacman -Syyuw --noconfirm" >> /etc/sudoers.d/wheel
 
 ln -sf /bin/dash /bin/sh
 

arch-setup/fetch_keys.sh

@@ -9,7 +9,7 @@ then
     exit
 fi
 
-mc cp -r yeet-dots/dotfiles/tools/* ~/.local/bin/
+mc cp -r fr1nge-dots/dotfiles/tools/ ~/.local/bin/
 sudo chmod +x ~/.local/bin/*
 
 ~/.local/bin/jsteg reveal $loc > /tmp/out.zip.gpg

arch-setup/packages.base.arch

@@ -17,3 +17,4 @@ wget
 curl
 dash
 mksh
+acpi

arch-setup/packages.base.artix

@@ -11,8 +11,11 @@ xorg-xinit
 xorg-apps
 xf86-video-intel
 sudo
-cronie
 wget
 curl
 dash
 mksh
+acpi
+acpi-openrc
+dbus
+dbus-openrc

arch-setup/packages.rice

@@ -0,0 +1,34 @@
+yajl
+webkit2gtk
+surfraw
+fzf
+ytfzf
+zsh
+antibody
+direnv
+tmux
+lf
+bitwarden-cli
+wallabag-client
+spotify-tui
+spotifyd-full-git
+zathura
+notmuch
+msmtp
+isync
+pass
+libgee
+calcurse
+neomutt
+nvim
+mpd
+mpc
+mpc-mpris
+xbanish-timeout
+htop
+dunst
+mpv-mpris
+ncmpcpp
+cmake
+opencv
+xmenu

config/X11/xinitrc

@@ -6,13 +6,14 @@ pkill -f "bash /sbin/clipmenud"
 pkill -f "/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh"
 pkill -f "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
 pkill -f devmon
+
+echo "$DBUS_SESSION_BUS_ADDRESS" > /tmp/bus-session
+
 rm -rf $XDG_RUNTIME_DIR/day_cache
 
 source ~/.config.env
 gpgconf --dry-run --create-socketdir
 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-systemctl --user import-environment DISPLAY
-dbus-update-activation-environment --systemd DISPLAY
 
 export SSH_AUTH_SOCK
 
@@ -71,6 +72,6 @@ while [ -f /home/yigit/.cache/dwm-restart ];
 do
     rm -rf /home/yigit/.cache/dwm-restart
     dwmblocks > $XDG_RUNTIME_DIR/dwmblocks.out 2> $XDG_RUNTIME_DIR/dwmblocks.err &
-    dwm > $XDG_RUNTIME_DIR/dwm.log 2> $XDG_RUNTIME_DIR/dwm.err
+    exec dwm > $XDG_RUNTIME_DIR/dwm.log 2> $XDG_RUNTIME_DIR/dwm.err
     sleep 0.2
 done

config/zsh/cmds

@@ -12,8 +12,6 @@ hex() {
 	echo "obase=16; ibase=10; $1" | bc
 }
 
-ulimit -n 5000
-
 colors() {
     color=1;
     count=0;

install.sh

@@ -25,7 +25,7 @@ echo -n "Would you like to install all the necessary packages, not doing so migh
 read deps
 if [ ! "$deps" = "n" ]; then
   echo "Running update"
-  yay -S --needed --noconfirm $(cat ~/.dotfiles/arch-setup/packages.minimal)
+  yay -S --needed --noconfirm $(cat ~/.dotfiles/arch-setup/packages.rice) && exit 1
 fi
 
 rm -rf ~/.dotfiles_backup
@@ -92,14 +92,14 @@ cp ~/.dotfiles/config.env.def ~/.config.env
 echo "Downloading assets"
 prev=$(pwd)
 
-curl https://minio.yigitcolakoglu.com/minio/dotfiles/tools/mc > "$HOME/.local/bin"
+curl https://minio.yigitcolakoglu.com/dotfiles/tools/mc > "$HOME/.local/bin/mc"
 chmod +x "$HOME/.local/bin/mc"
 $HOME/.local/bin/mc alias set fr1nge-dots https://minio.yigitcolakoglu.com "" ""
-mc cp -r yeet-dots/dotfiles/fonts/* ~/.local/share/fonts/
+mc cp -r fr1nge-dots/dotfiles/fonts/ ~/.local/share/fonts/
 fc-cache
 
 ## Backgrounds
-mc cp -r yeet-dots/dotfiles/backgrounds/* ~/.local/backgrounds/
+mc cp -r fr1nge-dots/dotfiles/backgrounds/ ~/.local/backgrounds/
 
 # Setup Crontab
 if [ ! -f "/var/spool/cron/$username" ]; then
@@ -140,17 +140,19 @@ mkdir -p "$WEECHAT_HOME"
 mkdir -p "$JUPYTER_CONFIG_DIR"
 mkdir -p "$PYLINTHOME"
 mkdir -p "$HOME/.local/share/zsh"
-mkdir -p "$XDG_DATA_DIR/mail"
-mkdir -p "$XDG_CONFIG_DIR/git"
-mkdir -p "$XDG_CACHE_DIR/surf"
+mkdir -p "$XDG_DATA_HOME/mail"
+mkdir -p "$XDG_CONFIG_HOME/git"
+mkdir -p "$XDG_CACHE_HOME/surf"
 
 chmod 700 "$GNUPGHOME"
-touch "$XDG_CONFIG_DIR/git/config"
+touch "$XDG_CONFIG_HOME/git/config"
 touch "$_Z_DATA"
 
 # Root Files and Directories
 sudo mkdir -p /usr/share/xsessions
 sudo cp ~/.dotfiles/root/dwm.desktop /usr/share/xsessions
+sudo cp ~/.dotfiles/root/issue /etc/issue
+sudo cp ~/.dotfiles/root/motd /etc/motd
 sudo cp ~/.dotfiles/root/nancyj.flf /usr/share/figlet/fonts
 sudo cp ~/.dotfiles/root/quark.service /usr/lib/systemd/system
 sudo cp ~/.dotfiles/root/kdialog /usr/local/bin/kdialog
@@ -162,7 +164,7 @@ sudo systemctl enable quark
 
 if [ "$username" = "yigit" ]; then
   ~/.dotfiles/arch-setup/fetch_keys.sh # Fetch keys (For personal use, this is not for you)
-  mkdir -p "$XDG_DATA_DIR/mail/yigitcolakoglu@hotmail.com"
+  mkdir -p "$XDG_DATA_HOME/mail/yigitcolakoglu@hotmail.com"
   git config --global user.email "yigitcolakoglu@hotmail.com"
   git config --global user.name "Yigit Colakoglu"
 fi
@@ -220,9 +222,10 @@ sudo make install > /dev/null 2> /dev/null
 cd $prev
 
 # Do a cleanup and delete some problematic files
-mv ~/.fzf ~/.local/share/fzf
 rm -rf ~/.fzf*
 rm -rf ~/.bash_profile
+rm -rf ~/.dotfiles/yarn.lock
+rm -rf ~/.dotfiles/.git/hooks/*
 sudo rm -rf /etc/urlview/system.urlview
 
 

local/bin/daily-update

@@ -9,22 +9,22 @@ cached=$(cat "$XDG_RUNTIME_DIR"/day_cache)
 
 if [ "$hour" -le "$morning" ]; then
   if [ ! "$cached" = "night"  ]; then
-    feh --no-fehbg --bg-fill ~/.local/backgrounds/evening/"$(find ~/.local/backgrounds/evening | sort -R | tail -1 )"
+    feh --no-fehbg --bg-fill "$(find ~/.local/backgrounds/evening | sort -R | tail -1 )"
     echo "night" > "$XDG_RUNTIME_DIR/day_cache"
   fi
 elif [ "$night" -le "$hour" ]; then
   if [ ! "$cached" = "night"  ]; then
-    feh --no-fehbg --bg-fill ~/.local/backgrounds/evening/"$(find ~/.local/backgrounds/evening | sort -R | tail -1 )"
+    feh --no-fehbg --bg-fill "$(find ~/.local/backgrounds/evening | sort -R | tail -1 )"
     echo "night" > "$XDG_RUNTIME_DIR/day_cache"
   fi
 elif [ "$afternoon" -le "$hour" ]; then
   if [ ! "$cached" = "afternoon"  ]; then
-    feh --no-fehbg --bg-fill ~/.local/backgrounds/afternoon/"$(find ~/.local/backgrounds/afternoon| sort -R | tail -1 )"
+    feh --no-fehbg --bg-fill "$(find ~/.local/backgrounds/afternoon| sort -R | tail -1 )"
     echo "afternoon" > "$XDG_RUNTIME_DIR/day_cache"
   fi
 else
   if [ ! "$cached" = "morning"  ]; then
-    feh --no-fehbg --bg-fill ~/.local/backgrounds/morning/"$(find ~/.local/backgrounds/morning | sort -R | tail -1 )"
+    feh --no-fehbg --bg-fill "$(find ~/.local/backgrounds/morning | sort -R | tail -1 )"
     echo "morning" > "$XDG_RUNTIME_DIR/day_cache"
   fi
 fi

local/bin/pacontrol.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # pacontrol.sh
 #

local/bin/readability

@@ -1,74 +0,0 @@
-#!/usr/bin/env node
-
-var program = require('commander')
-  , read = require('node-readability')
-  , he = require('he')
-  , pkg = require('../package.json')
-  , clc = require('cli-color');
-
-
-
-program
-  .version(pkg.version)
-  .option('-c, --color', 'use colors in terminal')
-  .option('-f, --format [format]', 'set the format for the result (text or html)', '')
-  .parse(process.argv);
-
-var styles = {};
-styles.h1 = styles.h2 = styles.muted = function(s) { return s; };
-
-if(program.color) {
-  styles.h1 = clc.underline.bold;
-  styles.h2 = clc.bold;
-  styles.muted = clc.white;
-  console.log(clc.reset);
-}
-
-var error = function(msg) {
-  if(msg) console.log(clc.red("Error: ")+msg);
-  console.log();
-  usage();
-  process.exit(0);
-}
-
-var usage = function() {
-  console.log("Usage: readability [url]");
-  console.log();
-  console.log("E.g.: readability http://techcrunch.com/2014/02/12/marc-andreessen-tech-is-still-recovering-from-a-depression");
-  console.log();
-}
-
-
-if(process.argv.length < 2) return error();
-var url = process.argv[2];
-
-if(typeof url!='string' || !url.match(/^https?:\/\//)) return error(url+" is an invalid url");
-
-console.log(url);
-read(url, function(err, article, meta) {
-  // The title of the page.
-  console.log();
-  console.log(styles.h1(article.title));
-  console.log();
-  // The main body of the page.
-  // console.log(article.content);
-  var content = article.content;
-
-  if(program.format == 'html') return console.log(content);
-
-  content = content.replace(/<h[2-9]>([^<])+<\/h[2-9]>/gi, function(match, header) {
-    return styles.h2(match);
-  });
-
-  content = content.replace(/ {2,*}|\t/g,' ');
-
-  var content = content.replace(/<\/?[^>]+(>|$)/g, "");
-  content = he.decode(content);
-  console.log(content);
-
-  // The raw HTML code of the page
-  //console.log(article.html);
-  // The document object of the page
-  //console.log(article.document);
-
-});

profile

@@ -27,7 +27,6 @@ export XDG_CONFIG_HOME="$HOME"/.config
 export XDG_CACHE_HOME="$HOME"/.cache
 export XDG_DATA_DIRS="/usr/local/share:/usr/share"
 export XDG_CONFIG_DIRS="/etc/xdg"
-export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus"
 export XDG_RUNTIME_DIR="/run/user/1000"
 
 # LF Icons
@@ -73,3 +72,11 @@ export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
 export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
+
+if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+  if [ ! "$DBUS_SESSION_BUS_ADDRESS" ] && [ ! $(command -v dbus-launch) ]; then
+    exec dbus-launch --exit-with-session xinit 2> $XDG_RUNTIME_DIR/xinit.err > $XDG_RUNTIME_DIR/xinit || exit
+  else
+    exec xinit
+  fi
+fi

root/issue

@@ -0,0 +1,11 @@
+
+                                                            | \s \r
+       /\\                      ||     | |                   |
+      /  \\                     ||     |     _               | \t
+     / .. \\   //==\\\\ ||/= /==\\ ||/=\\  | | |/ \\ |  | \\ /     | \d
+    / .  . \\  ||  || ||   |    ||  || | | |  | |  |  X      |
+   /  .  .  \\ \\\\==/| ||   \\==/ ||  || | | |  | \\_/| / \\     | \U
+  / ..    .. \\   A simple, lightweight linux distribution.  |
+ /_'        `_\\                                             | \l on \n
+ 
+

root/makeissue

@@ -0,0 +1,11 @@
+echo -e '\e[H\e[2J' > issue
+echo -e '                                                            \e[1;30m| \e[34m\\s \\r' >> issue
+echo -e '       \e[36;1m/\\\\                      \e[37m||     \e[36m| |                   \e[30m|' >> issue
+echo -e '      \e[36m/  \\\\                     \e[37m||     \e[36m|     _               \e[30m| \e[32m\\t' >> issue
+echo -e '     \e[1;36m/ \e[0;36m.. \e[1m\\\\   \e[37m//==\\\\\\\\ ||/= /==\\\\ ||/=\\\\  \e[36m| | |/ \\\\ |  | \\\\ /     \e[30m| \e[32m\\d' >> issue
+echo -e '    \e[0;36m/ .  . \\\\  \e[37m||  || ||   |    ||  || \e[36m| | |  | |  |  X      \e[1;30m|' >> issue
+echo -e '   \e[0;36m/  .  .  \\\\ \e[37m\\\\\\\\==/| ||   \\\\==/ ||  || \e[36m| | |  | \\\\_/| / \\\\     \e[1;30m| \e[31m\\U' >> issue
+echo -e '  \e[0;36m/ ..    .. \\\\   \e[0;37mA simple, lightweight linux distribution.  \e[1;30m|' >> issue
+echo -e ' \e[0;36m/_\x27        `_\\\\                                             \e[1;30m| \e[35m\\l \e[0mon \e[1;33m\\n' >> issue
+echo -e ' \e[0m' >> issue
+echo -e '' >> issue

root/motd

@@ -0,0 +1,11 @@
+
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.           @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+(@@@@@@@                        @@@@@@@@@@@@@@@@                         @@@@@@@
+ @@@@@@                           @@@@@@@@@@@@@                           @@@@@
+   @@@.                           @@@      @@@@                           @@@@
+   %@@,                          ,@@@       @@@                           @@@
+    @@@                          @@@         @@@                          @@@
+     @@                         @@@           @@@                         @@
+     @@@                      ,@@              @@@                       @@/
+      @@@                    @@.                 @@@                    @@,
+        @@@@@@@@@@@@@@@@@@@@@                       @@@@@@@@@@@@@@@@@@@@&