mirror of
https://github.com/eoli3n/dotfiles
synced 2024-11-22 15:01:59 +01:00
remove xprofile, all in sway, and bash_profile autostarts sway
This commit is contained in:
eoli3n
parent
4439e0afb2
commit
08d13c0a85
@ -44,7 +44,6 @@
|
||||
|
||||
- hosts: desktop:laptop
|
||||
roles:
|
||||
- { role: xprofile, tags: xprofile }
|
||||
- { role: packages-desktop, tags: packages-desktop }
|
||||
- { role: gtk, tags: gtk }
|
||||
- { role: sway, tags: sway }
|
||||
@ -54,7 +53,6 @@
|
||||
- { role: termite, tags: termite }
|
||||
- { role: weechat, tags: weechat }
|
||||
- { role: ssh-agent, tags: ssh-agent }
|
||||
- { role: dpms, tags: dpms }
|
||||
tasks:
|
||||
- include_role:
|
||||
name: vagrant
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
#dpms and screen saver 60s
|
||||
xset s 60 60
|
||||
xset dpms 60 60 60
|
||||
@ -1,5 +0,0 @@
|
||||
---
|
||||
- name: configure dpms in xprofile
|
||||
copy:
|
||||
src: dpms.sh
|
||||
dest: ~/.xprofile.d/
|
||||
@ -1,107 +0,0 @@
|
||||
# Shadow
|
||||
shadow = false;
|
||||
# no-dnd-shadow = true;
|
||||
# no-dock-shadow = true;
|
||||
clear-shadow = true;
|
||||
shadow-radius = 7;
|
||||
shadow-offset-x = -7;
|
||||
shadow-offset-y = -7;
|
||||
# shadow-opacity = 0.7;
|
||||
# shadow-red = 0.0;
|
||||
# shadow-green = 0.0;
|
||||
# shadow-blue = 0.0;
|
||||
shadow-exclude = [
|
||||
"name = 'Notification'",
|
||||
"class_g = 'Conky'",
|
||||
"class_g ?= 'Notify-osd'",
|
||||
"class_g = 'Cairo-clock'",
|
||||
"_GTK_FRAME_EXTENTS@:c",
|
||||
"name = 'jgmenu'",
|
||||
"class_g = 'jgmenu'"
|
||||
];
|
||||
# shadow-exclude = "n:e:Notification";
|
||||
# shadow-exclude-reg = "x10+0+0";
|
||||
# xinerama-shadow-crop = true;
|
||||
|
||||
# Opacity
|
||||
menu-opacity = 0.8;
|
||||
#inactive-opacity = 0.8;
|
||||
# active-opacity = 0.8;
|
||||
frame-opacity = 1.0;
|
||||
inactive-opacity-override = false;
|
||||
alpha-step = 0.06;
|
||||
# inactive-dim = 0.2;
|
||||
# inactive-dim-fixed = true;
|
||||
# blur-background = true;
|
||||
# blur-background-frame = true;
|
||||
# blur-kern = "3x3box"
|
||||
# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"
|
||||
# blur-background-fixed = true;
|
||||
blur-background-exclude = [
|
||||
"window_type = 'dock'",
|
||||
"window_type = 'desktop'",
|
||||
"_GTK_FRAME_EXTENTS@:c"
|
||||
];
|
||||
# opacity-rule = [ "80:class_g = 'URxvt'" ];
|
||||
opacity-rule = [
|
||||
"99:class_g = 'Firefox' && window_type = 'tooltip'",
|
||||
"99:class_g = 'Conky' && window_type = 'dock'",
|
||||
"0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
|
||||
];
|
||||
|
||||
# Fading
|
||||
fading = true;
|
||||
# fade-delta = 30;
|
||||
fade-in-step = 0.1;
|
||||
fade-out-step = 0.1;
|
||||
# no-fading-openclose = true;
|
||||
# no-fading-destroyed-argb = true;
|
||||
fade-exclude = [ ];
|
||||
|
||||
# Other
|
||||
backend = "xrender"
|
||||
mark-wmwin-focused = true;
|
||||
mark-ovredir-focused = true;
|
||||
# use-ewmh-active-win = true;
|
||||
detect-rounded-corners = true;
|
||||
detect-client-opacity = true;
|
||||
refresh-rate = 0;
|
||||
vsync = "none";
|
||||
dbe = false;
|
||||
paint-on-overlay = true;
|
||||
# sw-opti = true;
|
||||
# unredir-if-possible = true;
|
||||
# unredir-if-possible-delay = 5000;
|
||||
# unredir-if-possible-exclude = [ ];
|
||||
focus-exclude = [ "class_g = 'Cairo-clock'" ];
|
||||
detect-transient = true;
|
||||
detect-client-leader = true;
|
||||
invert-color-include = [ ];
|
||||
# resize-damage = 1;
|
||||
|
||||
# GLX backend
|
||||
# glx-no-stencil = true;
|
||||
glx-copy-from-front = false;
|
||||
# glx-use-copysubbuffermesa = true;
|
||||
# glx-no-rebind-pixmap = true;
|
||||
glx-swap-method = "undefined";
|
||||
# glx-use-gpushader4 = true;
|
||||
# xrender-sync = true;
|
||||
# xrender-sync-fence = true;
|
||||
|
||||
# Window type settings
|
||||
wintypes:
|
||||
{
|
||||
tooltip =
|
||||
{
|
||||
fade = true;
|
||||
shadow = true;
|
||||
opacity = 0.75;
|
||||
focus = true;
|
||||
};
|
||||
|
||||
dock =
|
||||
{
|
||||
opacity = 0.9;
|
||||
};
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
picom --backend glx --vsync -GCb --config ~/.picom &
|
||||
@ -1 +0,0 @@
|
||||
picom --config ~/.picom &
|
||||
@ -1,23 +0,0 @@
|
||||
---
|
||||
- name: Install compton
|
||||
package:
|
||||
name: picom
|
||||
become: yes
|
||||
|
||||
- name: Configure picom
|
||||
copy:
|
||||
src: picom
|
||||
dest: ~/.picom
|
||||
backup: yes
|
||||
|
||||
- name: Init compton in .xprofile
|
||||
copy:
|
||||
src: picom.sh
|
||||
dest: ~/.xprofile.d/
|
||||
when: ansible_user_id != "vagrant"
|
||||
|
||||
- name: Init compton in .xprofile [Vagrant]
|
||||
copy:
|
||||
src: picom.vagrant.sh
|
||||
dest: ~/.xprofile.d/
|
||||
when: ansible_user_id == "vagrant"
|
||||
3
roles/sway/files/bash_profile
Normal file
3
roles/sway/files/bash_profile
Normal file
@ -0,0 +1,3 @@
|
||||
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
|
||||
exec sway
|
||||
fi
|
||||
@ -1,38 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
userresources=$HOME/.Xresources
|
||||
usermodmap=$HOME/.Xmodmap
|
||||
sysresources=/etc/X11/xinit/.Xresources
|
||||
sysmodmap=/etc/X11/xinit/.Xmodmap
|
||||
|
||||
# merge in defaults and keymaps
|
||||
|
||||
if [ -f $sysresources ]; then
|
||||
xrdb -merge $sysresources
|
||||
fi
|
||||
|
||||
if [ -f $sysmodmap ]; then
|
||||
xmodmap $sysmodmap
|
||||
fi
|
||||
|
||||
if [ -f "$userresources" ]; then
|
||||
xrdb -merge "$userresources"
|
||||
fi
|
||||
|
||||
if [ -f "$usermodmap" ]; then
|
||||
xmodmap "$usermodmap"
|
||||
fi
|
||||
|
||||
# start some nice programs
|
||||
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
|
||||
for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
|
||||
[ -x "$f" ] && . "$f"
|
||||
done
|
||||
unset f
|
||||
fi
|
||||
|
||||
# source .xprofile
|
||||
[ -f ~/.xprofile ] && source ~/.xprofile
|
||||
|
||||
#exec i3
|
||||
exec sway -d 2> ~/sway.log
|
||||
@ -20,3 +20,8 @@
|
||||
template:
|
||||
src: config.j2
|
||||
dest: ~/.config/sway/config
|
||||
|
||||
- name: autostart sway
|
||||
copy:
|
||||
src: bash_profile
|
||||
dest: ~/.bash_profile
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
#INCLUDE####################################################
|
||||
# output configuration
|
||||
# Latitude
|
||||
set $laptop "eDP-1"
|
||||
# Dell
|
||||
set $screen "DP-3"
|
||||
# Benq
|
||||
set $proj "DP-4"
|
||||
|
||||
output $laptop pos 1920 1330 res 1920x1080 scale 1.3
|
||||
output $screen pos 0 1080 res 1920x1080
|
||||
output $proj pos 0 0 res 1920x1080
|
||||
|
||||
# dpms
|
||||
output * dpms on
|
||||
|
||||
# turn of screen when laptop closed
|
||||
bindswitch --reload lid:on output $laptop disable
|
||||
bindswitch --reload lid:off output $laptop enable
|
||||
|
||||
@ -27,8 +27,10 @@ workspace $tag9 output $laptop
|
||||
workspace $tag10 output $laptop
|
||||
|
||||
# exec startup apps
|
||||
exec --no-startup-id swaymsg 'exec xbindkeys &'
|
||||
exec --no-startup-id swaymsg 'exec variety &'
|
||||
exec --no-startup-id swaymsg 'exec google-chrome-stable'
|
||||
exec --no-startup-id swaymsg 'exec google-chrome-stable --app="https://gmail.com"'
|
||||
exec --no-startup-id swaymsg 'workspace $tag4; exec termite -e "screen -rd weechat &"'
|
||||
exec --no-startup-id swaymsg 'workspace $tag2; exec termite'
|
||||
exec --no-startup-id swaymsg 'workspace $tag2; exec termite -e "ssh-add"'
|
||||
#INCLUDE####################################################
|
||||
|
||||
@ -1 +0,0 @@
|
||||
feh --bg-scale ~/img/wallpaper.jpg &
|
||||
@ -8,8 +8,3 @@
|
||||
copy:
|
||||
src: wallpaper.jpg
|
||||
dest: ~/img/
|
||||
|
||||
- name: Init wallpaper in .xprofile
|
||||
copy:
|
||||
src: wallpaper.sh
|
||||
dest: ~/.xprofile.d/
|
||||
|
||||
@ -10,8 +10,3 @@
|
||||
src: variety.conf
|
||||
dest: ~/.config/variety
|
||||
backup: yes
|
||||
|
||||
- name: configure variety xprofile
|
||||
copy:
|
||||
src: variety.sh
|
||||
dest: ~/.xprofile.d/
|
||||
|
||||
@ -1 +0,0 @@
|
||||
screen -DmS weechat /usr/bin/weechat &
|
||||
@ -7,12 +7,6 @@
|
||||
state: present
|
||||
become: True
|
||||
|
||||
- name: Weechat in xprofile
|
||||
copy:
|
||||
src: weechat.sh
|
||||
dest: ~/.xprofile.d/
|
||||
when: ansible_user_id != "vagrant"
|
||||
|
||||
- name: Start weechat
|
||||
shell: screen -DmS weechat /usr/bin/weechat &
|
||||
changed_when: False
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
for f in ~/.xprofile.d/*.sh; do
|
||||
. $f
|
||||
done
|
||||
@ -1,10 +0,0 @@
|
||||
---
|
||||
- name: create xprofile.d
|
||||
file:
|
||||
path: ~/.xprofile.d
|
||||
state: directory
|
||||
|
||||
- name: configure xprofile.d
|
||||
copy:
|
||||
src: xprofile
|
||||
dest: ~/.xprofile
|
||||
Loading…
Reference in New Issue
Block a user