Clenaup linting

roles-ansible · Jul 23, 2024 · 2100e20 · 2100e20
1 parent 0f873e1
commit 2100e20
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 114 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -20,126 +20,76 @@ sway__lock: 'swaylock --color 000000 --image /usr/share/backgrounds/sway/Sway_Wa
 sway__waybar: true
 sway__waybar_modules_left: ["sway/workspaces", "sway/mode", "sway/scratchpad"]
 sway__waybar_modules_center: ["sway/window"]
-sway__waybar_modules_right: ["idle_inhibitor", "custom/weather", "pulseaudio", "network", "cpu", "memory", "disk", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "custom/power", "clock", "tray"]
+sway__waybar_modules_right:
+  - "idle_inhibitor"
+  - "custom/weather"
+  - "pulseaudio"
+  - "network"
+  - "cpu"
+  - "memory"
+  - "disk"
+  - "temperature"
+  - "backlight"
+  - "keyboard-state"
+  - "sway/language"
+  - "battery"
+  - "custom/power"
+  - "clock"
+  - "tray"
+
 sway__waybar_font_size: '13px'
-sway__waybar_light_up:  'light -A 1'
-sway__waybar_light_down:  'light -U 1'
+sway__waybar_light_up: 'light -A 1'
+sway__waybar_light_down: 'light -U 1'
 sway__wlsunset: true
 sway__wlsunset_params: '-l 49 -L 8.4'
 
 sway__keybindings:
- - keybinding:
-   name: Volume (mute/unmute)
-   key: $mod+F12
-   exec: --no-startup-id pulsemixer --toggle-mute
- - keybinding:
-   name: Volue (default)
-   key: $mod+Shift+F12
-   exec: --no-startup-id pulsemixer --set-volume 42
- - keybinding:
-   name: volume-up
-   key: XF86AudioRaiseVolume
-   exec: --no-startup-id pulsemixer --change-volume +3
- - keybinding:
-   name: volume-down
-   key: XF86AudioLowerVolume
-   exec: --no-startup-id pulsemixer --change-volume -5
- - keybinding:
-   name: Toggle Mic Mute
-   key: XF86AudioMicMute
-   exec: '--no-startup-id pulsemixer --toggle-mute --id $(pulsemixer --list-sources | cut -f3 | grep Default  | cut -d "," -f 1 | cut -c 6-)'
- - keybinding:
-   name: Mic volume up
-   key: $mod+Shift+F4
-   exec: '--no-startup-id pulsemixer  --change-volume +3 --id $(pulsemixer --list-sources | cut -f3 | grep Default  | cut -d "," -f 1 | cut -c 6-)'
- - keybinding:
-   name: Mic volume down
-   key: $mod+F4
-   exec: '--no-startup-id pulsemixer  --change-volume -5 --id $(pulsemixer --list-sources | cut -f3 | grep Default  | cut -d "," -f 1 | cut -c 6-)'
- - keybinding:
-   name: Toggle Mic Mute
-   key: XF86AudioMute
-   exec: --no-startup-id pulsemixer --toggle-mute
- - keybinding:
-   name: darker
-   key: XF86MonBrightnessDown
-   exec: --no-startup-id light -U 9
- - keybinding:
-   name: lighter
-   key: XF86MonBrightnessUp
-   exec: --no-startup-id light -A 6
- - keybinding:
-   name: display settings
-   key: XF86WakeUp
-   exec: wdisplays
+  - keybinding:
+    name: Volume (mute/unmute)
+    key: $mod+F12
+    exec: --no-startup-id pulsemixer --toggle-mute
+  - keybinding:
+    name: Volue (default)
+    key: $mod+Shift+F12
+    exec: --no-startup-id pulsemixer --set-volume 42
+  - keybinding:
+    name: volume-up
+    key: XF86AudioRaiseVolume
+    exec: --no-startup-id pulsemixer --change-volume +3
+  - keybinding:
+    name: volume-down
+    key: XF86AudioLowerVolume
+    exec: --no-startup-id pulsemixer --change-volume -5
+  - keybinding:
+    name: Toggle Mic Mute
+    key: XF86AudioMicMute
+    exec: '--no-startup-id pulsemixer --toggle-mute --id $(pulsemixer --list-sources | cut -f3 | grep Default  | cut -d "," -f 1 | cut -c 6-)'
+  - keybinding:
+    name: Mic volume up
+    key: $mod+Shift+F4
+    exec: '--no-startup-id pulsemixer  --change-volume +3 --id $(pulsemixer --list-sources | cut -f3 | grep Default  | cut -d "," -f 1 | cut -c 6-)'
+  - keybinding:
+    name: Mic volume down
+    key: $mod+F4
+    exec: '--no-startup-id pulsemixer  --change-volume -5 --id $(pulsemixer --list-sources | cut -f3 | grep Default  | cut -d "," -f 1 | cut -c 6-)'
+  - keybinding:
+    name: Toggle Mic Mute
+    key: XF86AudioMute
+    exec: --no-startup-id pulsemixer --toggle-mute
+  - keybinding:
+    name: darker
+    key: XF86MonBrightnessDown
+    exec: --no-startup-id light -U 9
+  - keybinding:
+    name: lighter
+    key: XF86MonBrightnessUp
+    exec: --no-startup-id light -A 6
+  - keybinding:
+    name: display settings
+    key: XF86WakeUp
+    exec: wdisplays
 
 sway__keybindings_extra: []
 
-
 # version check for this role?
 submodules_versioncheck: true
-
-
-# Here are the variables you may want to change
-# to configure i3wm
-i3_keybindings_extra: []
-#  - keybinding:
-#    name: example
-#    key: $mod+Shift+F10
-#    exec: --no-startup-id touch /tmp/example.txt
-
-i3_monitors: []
-# see: xrandr
-#  - monitor:
-#    id: 1
-#    output: "VGA-1"
-#    mode: "1920x1080"
-#    pos: "0x0"
-#    rotate: "normal"
-#    workspaces: [1,2,3,4,5,6,7,8,9,0] # bind workspace to a specific monitor
-
-i3_applications: []
-#    - application:
-#    class: "Firefox"
-#    name: "firefox"
-#    workspace: 1 # bind application to a specific workspace
-#    on_startup: false
-
-i3_run_on_startup: []
-#  - foo
-#  - bar
-
-
-## set default font size
-i3_font_size: 11
-i3_focus_follows_mouse: true
-
-# set i3lock options
-i3lock_options: "i3lock --image={{ i3wm_usr.home }}/.config/lockscreen.png --color 000000"
-
-# use fancy background
-i3_desktop_background: "{{ i3wm_usr.home }}/.config/background.png"
-
-# i3blocks options
-i3_i3blocks_options:
-  weather: true
-  audio_volume: true
-  wifisignal: true
-  ipaddress: true
-  clock: true
-  battery: true
-  ddate: true
-
-i3_rofi_config_file: 'files/rofi/dracula_dark.rasi'
-
-i3_terminal: "terminator"
-
-# install additional packages
-i3_packages_extra:
-  - ranger
-
-i3wm_copy_wallpapers: true
-
-disable_screensaver: true
-enable_lock_after_time: false
-lock_after_time: '90'  # minutes to wait until your screen is locked
diff --git a/vars/main.yml b/vars/main.yml
@@ -1,3 +1,3 @@
 ---
-playbook_version_number: 7  # should be int
+playbook_version_number: 8  # should be int
 playbook_version_path: 'role-roles-ansible.sway.version'