Cleanup some stuff
This commit is contained in:
		
							parent
							
								
									f2e9a4061f
								
							
						
					
					
						commit
						ccd4c85027
					
				
					 7 changed files with 46 additions and 45 deletions
				
			
		|  | @ -1,25 +1,15 @@ | ||||||
| #!/usr/bin/env sh | #!/usr/bin/env sh | ||||||
| 
 | 
 | ||||||
| _autoinstall_base () { | _autoinstall_base () { | ||||||
| 	plug_path="$HOME/.config/vim/autoload/plug.vim" | 	_autoinstall_file "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" \ | ||||||
| 	if [ ! -f "$plug_path" ] | 		"$HOME/.config/vim/autoload/plug.vim" \ | ||||||
| 	then | 		&& [ -x "$(command -v vim)" ] && yes | vim +'PlugInstall --sync' +qa --not-a-term | ||||||
| 		_autoinstall_file "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" "$plug_path" |  | ||||||
| 		[ -x "$(command -v vim)" ] && yes | vim +'PlugInstall --sync' +qa --not-a-term |  | ||||||
| 	fi |  | ||||||
| 
 | 
 | ||||||
| 	nvim_dir="$HOME/.config/nvim" | 	_autoinstall_git "https://github.com/AstroNvim/AstroNvim" "$HOME/.config/nvim" \ | ||||||
| 	if [ ! -d "$nvim_dir" ] | 		&& [ -x "$(command -v nvim)" ] && nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' | ||||||
| 	then |  | ||||||
| 		_autoinstall_git "https://github.com/AstroNvim/AstroNvim" "$nvim_dir" |  | ||||||
| 		[ -x "$(command -v nvim)" ] && nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' |  | ||||||
| 	fi |  | ||||||
| 
 | 
 | ||||||
| 	if [ ! -x "$(command -v starship)" ] | 	[ ! -x "$(command -v starship)" ] \ | ||||||
| 	then | 		&& curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh | ||||||
| 		mkdir -p "$HOME/.local/bin" |  | ||||||
| 		curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh |  | ||||||
| 	fi |  | ||||||
| 
 | 
 | ||||||
| 	_autoinstall_env "$WAKATIME_HOME/.wakatime.cfg" | 	_autoinstall_env "$WAKATIME_HOME/.wakatime.cfg" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -13,44 +13,42 @@ bspc config presel_feedback_color "#6272a4" | ||||||
| host_name=$(cat /proc/sys/kernel/hostname) | host_name=$(cat /proc/sys/kernel/hostname) | ||||||
| mode=$(cat /tmp/bspwm_mode) | mode=$(cat /tmp/bspwm_mode) | ||||||
| 
 | 
 | ||||||
|  | primary="${MONITOR_PRIMARY:-primary}" | ||||||
|  | secondary="${MONITOR_SECONDARY:-secondary}" | ||||||
|  | 
 | ||||||
| if [ "$host_name" = "portalo" ]; then | if [ "$host_name" = "portalo" ]; then | ||||||
|     if [ "$mode" = "presenter" ]; then |     if [ "$mode" = "presenter" ]; then | ||||||
|         xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144 |         xrandr --output "$primary" --mode 2560x1440 --refresh 144 | ||||||
|         xrandr --output "$MONITOR_SECONDARY" --auto --left-of "$MONITOR_PRIMARY" |         xrandr --output "$secondary" --auto --left-of "$primary" | ||||||
| 
 | 
 | ||||||
|         pkill xcompmgr; |         pkill xcompmgr; | ||||||
|         bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus voip messenger presenter1 |         bspc monitor "$primary" -d web terminal 3 4 5 6 focus voip messenger presenter1 | ||||||
|         bspc monitor "$MONITOR_SECONDARY" -d presenter2 |         bspc monitor "$secondary" -d presenter2 | ||||||
|     elif [ "$mode" = "single" ]; then |     elif [ "$mode" = "single" ]; then | ||||||
|         xrandr --output "$MONITOR_SECONDARY" --off |         xrandr --output "$secondary" --off | ||||||
|         bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus side-view voip messenger |         bspc monitor "$primary" -d web terminal 3 4 5 6 focus side-view voip messenger | ||||||
|     else  |     else  | ||||||
|         xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144 |         xrandr --output "$primary" --mode 2560x1440 --refresh 144 | ||||||
|         xrandr --output "$MONITOR_SECONDARY" --auto --left-of "$MONITOR_PRIMARY" |         xrandr --output "$secondary" --auto --left-of "$primary" | ||||||
| 
 | 
 | ||||||
|         bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus |         bspc monitor "$primary" -d web terminal 3 4 5 6 focus | ||||||
|         bspc monitor "$MONITOR_SECONDARY" -d side-view voip messenger |         bspc monitor "$secondary" -d side-view voip messenger | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY" | #elif echo "$host_name" | grep -Eq "laptop"; then | ||||||
|     sleep 1 |  | ||||||
|     bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY" |  | ||||||
| 
 |  | ||||||
| elif echo "$host_name" | grep -Eq "laptop"; then |  | ||||||
|     xrandr --output "$MONITOR_PRIMARY" --auto |  | ||||||
|     xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY" --auto |  | ||||||
| 
 |  | ||||||
|     bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus messenger |  | ||||||
|     bspc monitor "$MONITOR_SECONDARY" -d side-view 10 |  | ||||||
| 
 |  | ||||||
|     bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY" |  | ||||||
|     sleep 1 |  | ||||||
|     bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY" |  | ||||||
| 
 |  | ||||||
| else | else | ||||||
|     bspc monitor primary -d web terminal 3 4 5 6 7 8 9 focus |     xrandr --output "$primary" --auto | ||||||
|  |     xrandr --output "$secondary" --left-of "$primary" --auto | ||||||
|  | 
 | ||||||
|  |     bspc monitor "$primary" -d web terminal 3 4 5 6 focus messenger | ||||||
|  |     bspc monitor "$secondary" -d side-view 10 | ||||||
|  | 
 | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
|  | bspc wm -O "$primary" "$secondary" | ||||||
|  | sleep 1 | ||||||
|  | bspc wm -O "$primary" "$secondary" | ||||||
|  | 
 | ||||||
| bspc wm --adopt-orphans | bspc wm --adopt-orphans | ||||||
| 
 | 
 | ||||||
| bspc desktop web --layout monocle | bspc desktop web --layout monocle | ||||||
|  |  | ||||||
|  | @ -1 +0,0 @@ | ||||||
| /home/tobias/.config/nixpkgs/portalo-tobias.nix |  | ||||||
							
								
								
									
										1
									
								
								.config/nixpkgs/portable-tobias.nix
									
										
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								.config/nixpkgs/portable-tobias.nix
									
										
									
									
									
										Symbolic link
									
								
							|  | @ -0,0 +1 @@ | ||||||
|  | portalo-tobias.nix | ||||||
							
								
								
									
										11
									
								
								.config/nixpkgs/portalo-tobias.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								.config/nixpkgs/portalo-tobias.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,11 @@ | ||||||
|  | { config, pkgs, ... }: | ||||||
|  | 
 | ||||||
|  | { | ||||||
|  |   home.username = "tobias"; | ||||||
|  |   home.homeDirectory = "/home/tobias"; | ||||||
|  | 
 | ||||||
|  |   imports = [ | ||||||
|  |     ./common.nix | ||||||
|  |     ./graphical.nix | ||||||
|  |   ]; | ||||||
|  | } | ||||||
|  | @ -16,5 +16,7 @@ elif [[ $host_name == *"laptop"* ]]; then | ||||||
|     polybar laptop-primary & |     polybar laptop-primary & | ||||||
|     polybar laptop-secondary & |     polybar laptop-secondary & | ||||||
| else | else | ||||||
|     polybar base & |     #polybar base & | ||||||
|  |     polybar laptop-primary & | ||||||
|  |     polybar laptop-secondary & | ||||||
| fi | fi | ||||||
|  |  | ||||||
							
								
								
									
										0
									
								
								.local/bin/.gitkeep
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								.local/bin/.gitkeep
									
										
									
									
									
										Normal file
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue