Compare commits
9 Commits
9ae91e724d
...
3ff8990a35
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ff8990a35 | |||
| 5792877f25 | |||
| 1e5719c94c | |||
| ca58ee0c61 | |||
| 0d703b7cad | |||
| 5662e68a16 | |||
| 6db59607eb | |||
| 7040170468 | |||
| 40c2b659c7 |
@@ -150,7 +150,7 @@ font:
|
|||||||
style: Bold Italic
|
style: Bold Italic
|
||||||
|
|
||||||
# Point size
|
# Point size
|
||||||
size: {{ machine.font_size - 3 }}
|
size: {{ machine.font_size }}
|
||||||
|
|
||||||
# Offset is the extra space around each character. `offset.y` can be thought
|
# Offset is the extra space around each character. `offset.y` can be thought
|
||||||
# of as modifying the line spacing, and `offset.x` as modifying the letter
|
# of as modifying the line spacing, and `offset.x` as modifying the letter
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ BindsTo=autostart.target
|
|||||||
After=windowmanager.target
|
After=windowmanager.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
ExecStartPre=/usr/bin/env redshift-gtk -x
|
||||||
ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
|
ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
|
||||||
PassEnvironment=DISPLAY
|
PassEnvironment=DISPLAY
|
||||||
Restart=always
|
Restart=always
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ dotfiles:
|
|||||||
- from: i3/i3status.conf
|
- from: i3/i3status.conf
|
||||||
to: .i3/i3status.conf
|
to: .i3/i3status.conf
|
||||||
template: true
|
template: true
|
||||||
|
- from: i3/i3status-rs.toml
|
||||||
|
to: .i3/i3status-rs.toml
|
||||||
- from: i3/scripts
|
- from: i3/scripts
|
||||||
to: .i3/scripts
|
to: .i3/scripts
|
||||||
- from: tmux/tmux.conf
|
- from: tmux/tmux.conf
|
||||||
|
|||||||
13
i3/config.j2
13
i3/config.j2
@@ -115,8 +115,8 @@ workspace $workspace10 output {{ machine.screen.0 }}
|
|||||||
assign [class="^Keepassx$"] $workspace8
|
assign [class="^Keepassx$"] $workspace8
|
||||||
|
|
||||||
# See https://github.com/i3/i3/issues/2060
|
# See https://github.com/i3/i3/issues/2060
|
||||||
for_window [class="^Spotify$"] move to workspace $workspace9
|
for_window [class="^Spotify$"] move to workspace $workspace10
|
||||||
assign [class="^Spotify$"] $workspace9
|
assign [class="^Spotify$"] $workspace10
|
||||||
|
|
||||||
assign [class="^Google-chrome$"] $workspace7
|
assign [class="^Google-chrome$"] $workspace7
|
||||||
assign [class="^Chromium$"] $workspace7
|
assign [class="^Chromium$"] $workspace7
|
||||||
@@ -337,13 +337,11 @@ bindsym $mod+space exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
### BARS #######################################################################
|
### BARS #######################################################################
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
|
||||||
bar {
|
bar {
|
||||||
mode dock
|
mode dock
|
||||||
position bottom
|
position bottom
|
||||||
|
|
||||||
|
|
||||||
#tray_output HDMI3
|
|
||||||
tray_output primary
|
tray_output primary
|
||||||
tray_padding 2
|
tray_padding 2
|
||||||
|
|
||||||
@@ -358,7 +356,7 @@ bar {
|
|||||||
font pango:Inconsolata, FontAwesome {{ machine.font_size }}
|
font pango:Inconsolata, FontAwesome {{ machine.font_size }}
|
||||||
|
|
||||||
colors {
|
colors {
|
||||||
background #000000
|
background #272822
|
||||||
statusline #ffffff
|
statusline #ffffff
|
||||||
separator #555555
|
separator #555555
|
||||||
|
|
||||||
@@ -373,6 +371,5 @@ bar {
|
|||||||
binding_mode #272822 #e5b567 #272822
|
binding_mode #272822 #e5b567 #272822
|
||||||
}
|
}
|
||||||
|
|
||||||
i3bar_command i3bar
|
status_command i3status-rs ~/.i3/i3status-rs.toml
|
||||||
status_command py3status --standalone --dbus-notify -c ~/.i3/i3status.conf
|
|
||||||
}
|
}
|
||||||
|
|||||||
87
i3/i3status-rs.toml
Normal file
87
i3/i3status-rs.toml
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
icons_format = " {icon} "
|
||||||
|
|
||||||
|
[icons]
|
||||||
|
name = "awesome6"
|
||||||
|
|
||||||
|
[icons.overrides]
|
||||||
|
|
||||||
|
[theme]
|
||||||
|
name = "native"
|
||||||
|
|
||||||
|
[theme.overrides]
|
||||||
|
warning_fg = "#000000"
|
||||||
|
warning_bg = "#F4Bf75"
|
||||||
|
critical_fg = "#000000"
|
||||||
|
critical_bg = "#F92672"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "music"
|
||||||
|
player = "spotify"
|
||||||
|
buttons = ["prev", "play", "next"]
|
||||||
|
on_click = "exec $HOME/.i3/scripts/spotify-control toggle"
|
||||||
|
separator = " — "
|
||||||
|
dynamic_width = true
|
||||||
|
max_width = 1024
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "sound"
|
||||||
|
driver = "pulseaudio"
|
||||||
|
max_vol = 100
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "sound"
|
||||||
|
driver = "pulseaudio"
|
||||||
|
device_kind = "source"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "networkmanager"
|
||||||
|
primary_only = true
|
||||||
|
ap_format = "{strength} {ssid}"
|
||||||
|
device_format = "{icon}{ap}"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "load"
|
||||||
|
format = "{1m}"
|
||||||
|
warning = 8
|
||||||
|
critical = 1000
|
||||||
|
interval = 1
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "toggle"
|
||||||
|
text = " "
|
||||||
|
command_on = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
|
||||||
|
command_off = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
|
||||||
|
command_state = "[[ $($HOME/.i3/scripts/presentation-mode status) == off ]] || echo active"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "battery"
|
||||||
|
interval = 10
|
||||||
|
format = "{percentage} {time}"
|
||||||
|
hide_missing = true
|
||||||
|
if_command = "test -e /sys/class/power_supply/BAT0"
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "toggle"
|
||||||
|
text = " "
|
||||||
|
command_on = "systemctl --user start redshift"
|
||||||
|
command_off = "systemctl --user stop redshift"
|
||||||
|
command_state = "[[ $(systemctl --user is-active redshift) == active ]] && echo active"
|
||||||
|
signal = 0
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "toggle"
|
||||||
|
text = " "
|
||||||
|
command_on = "systemctl --user start spotify"
|
||||||
|
command_off = "systemctl --user stop spotify"
|
||||||
|
command_state = "[[ $(systemctl --user is-active spotify) == active ]] && echo active"
|
||||||
|
signal = 0
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "custom"
|
||||||
|
command = "ping -c 1 8.8.8.8 >/dev/null 2>/dev/null && echo || echo "
|
||||||
|
|
||||||
|
[[block]]
|
||||||
|
block = "time"
|
||||||
|
interval = 1
|
||||||
|
locale = "de_DE"
|
||||||
|
format = "[CW %V] %a %d.%m.%Y %H:%M:%S"
|
||||||
41
playbook.yml
41
playbook.yml
@@ -569,6 +569,27 @@
|
|||||||
become: true
|
become: true
|
||||||
loop: "{{ cargo_crate_list }}"
|
loop: "{{ cargo_crate_list }}"
|
||||||
|
|
||||||
|
- name: check if binary already exists for crates.io
|
||||||
|
stat:
|
||||||
|
path: /usr/local/lib/binaries/{{ binary_id_cratesio }}
|
||||||
|
register: rust_binary_cratesio
|
||||||
|
loop: "{{ cargo_crate_list }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.binary }}"
|
||||||
|
when: item.source|default('crates.io') == 'crates.io'
|
||||||
|
|
||||||
|
- name: check if binary already exists for git
|
||||||
|
stat:
|
||||||
|
path: /usr/local/lib/binaries/{{ binary_id_git }}
|
||||||
|
register: rust_binary_git
|
||||||
|
loop: "{{ cargo_crate_list }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.binary }}"
|
||||||
|
when: item.source|default('crates.io') == 'git'
|
||||||
|
|
||||||
|
- debug:
|
||||||
|
var: rust_binary_cratesio
|
||||||
|
|
||||||
- name: build rust crates from crates.io
|
- name: build rust crates from crates.io
|
||||||
shell: |
|
shell: |
|
||||||
set -o errexit
|
set -o errexit
|
||||||
@@ -581,7 +602,9 @@
|
|||||||
become: true # do not build as root!
|
become: true # do not build as root!
|
||||||
become_user: rust_build
|
become_user: rust_build
|
||||||
loop: "{{ cargo_crate_list }}"
|
loop: "{{ cargo_crate_list }}"
|
||||||
when: item.source|default('crates.io') == 'crates.io'
|
when:
|
||||||
|
- item.source|default('crates.io') == 'crates.io'
|
||||||
|
- not (rust_binary_cratesio.results | selectattr("item.binary", "match", item.binary))[0].stat.exists
|
||||||
|
|
||||||
- name: build rust crates from git
|
- name: build rust crates from git
|
||||||
shell: |
|
shell: |
|
||||||
@@ -594,7 +617,9 @@
|
|||||||
become: true # do not build as root!
|
become: true # do not build as root!
|
||||||
become_user: rust_build
|
become_user: rust_build
|
||||||
loop: "{{ cargo_crate_list }}"
|
loop: "{{ cargo_crate_list }}"
|
||||||
when: item.source|default('crates.io') == 'git'
|
when:
|
||||||
|
- item.source|default('crates.io') == 'git'
|
||||||
|
- not (rust_binary_git.results | selectattr("item.binary", "match", item.binary))[0].stat.exists
|
||||||
|
|
||||||
- name: create target directory
|
- name: create target directory
|
||||||
file:
|
file:
|
||||||
@@ -608,22 +633,24 @@
|
|||||||
- name: move binaries for crates.io
|
- name: move binaries for crates.io
|
||||||
shell: |
|
shell: |
|
||||||
mv /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }} /usr/local/lib/binaries/{{ binary_id_cratesio }}
|
mv /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }} /usr/local/lib/binaries/{{ binary_id_cratesio }}
|
||||||
ln -s /usr/local/lib/binaries/{{ binary_id_cratesio }} /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }}
|
|
||||||
args:
|
args:
|
||||||
creates: /usr/local/lib/binaries/{{ binary_id_cratesio }}
|
creates: /usr/local/lib/binaries/{{ binary_id_cratesio }}
|
||||||
become: true
|
become: true
|
||||||
loop: "{{ cargo_crate_list }}"
|
loop: "{{ cargo_crate_list }}"
|
||||||
when: item.source|default('crates.io') == 'crates.io'
|
when:
|
||||||
|
- item.source|default('crates.io') == 'crates.io'
|
||||||
|
- not (rust_binary_cratesio.results | selectattr("item.binary", "match", item.binary))[0].stat.exists
|
||||||
|
|
||||||
- name: move binaries for git
|
- name: move binaries for git
|
||||||
shell: |
|
shell: |
|
||||||
mv /var/lib/rust_build/.cargo/bin/{{ binary_id_git }} /usr/local/lib/binaries/{{ binary_id_git }}
|
mv /var/lib/rust_build/.cargo/bin/{{ binary_id_git }} /usr/local/lib/binaries/{{ binary_id_git }}
|
||||||
ln -s /usr/local/lib/binaries/{{ binary_id_git }} /var/lib/rust_build/.cargo/bin/{{ binary_id_git }}
|
|
||||||
args:
|
args:
|
||||||
creates: /usr/local/lib/binaries/{{ binary_id_git }}
|
creates: /usr/local/lib/binaries/{{ binary_id_git }}
|
||||||
become: true
|
become: true
|
||||||
loop: "{{ cargo_crate_list }}"
|
loop: "{{ cargo_crate_list }}"
|
||||||
when: item.source|default('crates.io') == 'git'
|
when:
|
||||||
|
- item.source|default('crates.io') == 'git'
|
||||||
|
- not (rust_binary_git.results | selectattr("item.binary", "match", item.binary))[0].stat.exists
|
||||||
|
|
||||||
- name: link binaries for crates.io
|
- name: link binaries for crates.io
|
||||||
file:
|
file:
|
||||||
@@ -739,7 +766,7 @@
|
|||||||
path: "{{ go_download.path }}"
|
path: "{{ go_download.path }}"
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
when: not go_target_stat.stat.exists
|
when: not go_target_stat.stat.exists and not ansible_check_mode
|
||||||
|
|
||||||
- name: link to the current go version
|
- name: link to the current go version
|
||||||
file:
|
file:
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
terraform_version: 1.2.4
|
terraform_version: 1.3.6
|
||||||
kubectl_version: v1.24.2
|
kubectl_version: v1.26.0
|
||||||
go_version: "1.18.3"
|
go_version: "1.19.4"
|
||||||
portfolio_performace_version: "0.57.2"
|
portfolio_performace_version: "0.57.2"
|
||||||
cargo_crate_list:
|
cargo_crate_list:
|
||||||
- crate: just
|
- crate: just
|
||||||
binary: just
|
binary: just
|
||||||
version: 1.2.0
|
version: 1.9.0
|
||||||
- crate: ripgrep
|
- crate: ripgrep
|
||||||
binary: rg
|
binary: rg
|
||||||
version: 13.0.0
|
version: 13.0.0
|
||||||
@@ -18,20 +18,16 @@ cargo_crate_list:
|
|||||||
archlinux: pcre2
|
archlinux: pcre2
|
||||||
- crate: fd-find
|
- crate: fd-find
|
||||||
binary: fd
|
binary: fd
|
||||||
version: 8.4.0
|
version: 8.6.0
|
||||||
- crate: bat
|
- crate: bat
|
||||||
binary: bat
|
binary: bat
|
||||||
version: 0.21.0
|
version: 0.22.1
|
||||||
- crate: exa
|
- crate: exa
|
||||||
binary: exa
|
binary: exa
|
||||||
version: 0.10.1
|
version: 0.10.1
|
||||||
toolchain: "1.60" # Fails with 1.61, see https://github.com/rust-lang/rust/issues/97255
|
|
||||||
- crate: watchexec-cli
|
|
||||||
binary: watchexec
|
|
||||||
version: 1.20.2
|
|
||||||
- crate: mdbook
|
- crate: mdbook
|
||||||
binary: mdbook
|
binary: mdbook
|
||||||
version: 0.4.18
|
version: 0.4.24
|
||||||
- url: https://github.com/hakoerber/git-repo-manager
|
- url: https://github.com/hakoerber/git-repo-manager
|
||||||
binary: grm
|
binary: grm
|
||||||
branch: develop
|
branch: develop
|
||||||
|
|||||||
Reference in New Issue
Block a user