From 35d5dc490ae9535d4a30dfbdb227a0718d071e3b Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 9 Dec 2018 00:15:03 +0100 Subject: [PATCH] improve some variables --- files/start.sh | 15 --------------- group_vars/thinkpad.yml | 12 +++++++++++- roles/copy_files/tasks/main.yml | 7 ------- roles/dotfiles | 2 +- 4 files changed, 12 insertions(+), 24 deletions(-) delete mode 100755 files/start.sh diff --git a/files/start.sh b/files/start.sh deleted file mode 100755 index b348d3b..0000000 --- a/files/start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -i3s=$(i3-msg -t get_workspaces) - -if [ '[]' == "$i3s" ]; then - echo "i3 not running" -else - if [ ! -f /tmp/autostart ]; then - tmux new-session -s i3-pannel -n etc -d 'sleep 5; /usr/bin/nm-applet --no-agent' - tmux new-window -t i3-pannel:1 -n nextcloud 'sleep 30; /usr/bin/nextcloud' - touch /tmp/autostart - else - ddate - fi -fi - diff --git a/group_vars/thinkpad.yml b/group_vars/thinkpad.yml index fed658b..27290df 100644 --- a/group_vars/thinkpad.yml +++ b/group_vars/thinkpad.yml @@ -15,6 +15,15 @@ i3_keybindings_extra: name: Volue (default) key: $mod+Shift+F12 exec: --no-startup-id amixer sset Master 40% + - keybinding: + name: darker + key: XF86MonBrightnessDown + exec: --no-startup-id light -U 12 + - keybinding: + name: lighter + key: XF86MonBrightnessUp + exec: --no-startup-id light -A 9 + i3_applications: - application: @@ -36,8 +45,9 @@ i3_desktop_env: background: "/home/{{ user }}/.config/background.png" i3lock_options: "i3lock --image=/home/{{ user }}/.config/lockscreen.png" + # optional .bashrc commands bash: - bashrc: "if [ ! -f /tmp/autostart ]; then\n /opt/start.sh \n# ssh-add ~/.ssh/id_ed25519\nelse\n ddate;fi\n" + bashrc: "alias pwgen=\"/usr/bin/pwgen --num-passwords=2000 --numerals --capitalize --secure --no-vowels --symbols 66 | grep -v '0' | grep -v 'o' | grep -v 'O' | grep -v 'r' | grep -v 'v' | grep -v 'I' | grep -v 'l' | grep -v 'y' | grep -v 'z' | grep -v '1' | grep -v '#' | grep -v '%' | grep -v '`' | grep -v 'ยด' | grep -v '@' | tail -1\"\n" diff --git a/roles/copy_files/tasks/main.yml b/roles/copy_files/tasks/main.yml index 9034f6a..e9d50c1 100644 --- a/roles/copy_files/tasks/main.yml +++ b/roles/copy_files/tasks/main.yml @@ -16,11 +16,4 @@ group: "{{ user }}" mode: 0644 -- name: copy start - copy: - src: files/start.sh - dest: /opt/start.sh - owner: "root" - group: "root" - mode: 0644 diff --git a/roles/dotfiles b/roles/dotfiles index 06a76f8..a8afabb 160000 --- a/roles/dotfiles +++ b/roles/dotfiles @@ -1 +1 @@ -Subproject commit 06a76f8b2872519b57d9b4ea5c5d2fcc03bfbe52 +Subproject commit a8afabbfa5d46c09e436688b8b3c33b2e48bbdea