diff --git a/emacs.d/init.el b/emacs.d/init.el index 5661c32..5e2c88b 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -468,3 +468,4 @@ (use-package yasnippet-snippets) ;;; End init.el + diff --git a/emacs.d/snippets/python-mode/intro-programming-hw.yasnippet b/emacs.d/snippets/python-mode/intro-programming-hw.yasnippet new file mode 100644 index 0000000..36e5c58 --- /dev/null +++ b/emacs.d/snippets/python-mode/intro-programming-hw.yasnippet @@ -0,0 +1,8 @@ +# -*- mode: snippet -*- +# key : 161 +# group: school +# name : cs hw header +# -- +# Author: $1 +# Date: `(format-time-string "%m-%d-%Y")`$0 +# Description: $2 diff --git a/info/screenshots/screenshot2.png b/info/screenshots/screenshot2.png index 4ced9ca..d56c760 100644 Binary files a/info/screenshots/screenshot2.png and b/info/screenshots/screenshot2.png differ diff --git a/install.sh b/install.sh index ce320eb..47ca93e 100755 --- a/install.sh +++ b/install.sh @@ -25,10 +25,6 @@ cp -a $config_dir/dunst $backup/ cp -a $config_dir/kitty $backup/ cp -a $config_dir/nvim $backup/ cp -a $config_dir/polybar $backup/ -<<<<<<< HEAD -======= -cp -a $config_dir/ranger $backup/ ->>>>>>> 4f3a112 (Fix rebase conflicts) cp -a $bin_dir $backup/ # Delete current files and folders @@ -43,10 +39,6 @@ rm -rf $config_dir/dunst rm -rf $config_dir/kitty rm -rf $config_dir/nvim rm -rf $config_dir/polybar -<<<<<<< HEAD -======= -rm -rf $config_dir/ranger/ ->>>>>>> 4f3a112 (Fix rebase conflicts) rm -rf $bin_dir # Create HOME symlinks @@ -70,14 +62,15 @@ ln -sf $dotfiles_dir/config/polybar/config.ini $config_dir/polybar/config.ini ln -sf $dotfiles_dir/config/polybar/colors.ini $config_dir/polybar/colors.ini ln -sf $dotfiles_dir/config/polybar/modules.ini $config_dir/polybar/modules.ini ln -sf $dotfiles_dir/config/polybar/custom_modules.ini $config_dir/polybar/custom_modules.ini +ln -sf $dotfiles_dir/config/rofi/config.everforest.rasi $config_dir/rofi/config.rasi #ln -sf $dotfiles_dir/config/rofi/config.gruvbox.rasi $config_dir/rofi/config.rasi -ln -sf $dotfiles_dir/config/rofi/config.zenburn.rasi $config_dir/rofi/config.rasi +#ln -sf $dotfiles_dir/config/rofi/config.zenburn.rasi $config_dir/rofi/config.rasi ln -sf $dotfiles_dir/config/sxhkd/sxhkdrc $config_dir/sxhkd/sxhkdrc # Create $bin_dir and symlinks mkdir -p $bin_dir ln -sf $dotfiles_dir/bin/mirror-outputs $bin_dir -ln -sf $dotfiles_dir/bin/dual-polybar-launcher $bin_dir +ln -sf $dotfiles_dir/bin/single-polybar-launcher $bin_dir ln -sf $dotfiles_dir/bin/toggle-wifi $bin_dir # Finishing up @@ -85,4 +78,3 @@ source ~/.bashrc source ~/.bash_profile source ~/.profile xrdb ~/.Xresources -