From e571a8224cc4a46c7fbb2a36a1380662703b9cfd Mon Sep 17 00:00:00 2001 From: BluemediaDev Date: Tue, 4 Feb 2025 17:46:55 +0100 Subject: [PATCH 1/3] Update Hyprland to v0.47.2 --- roles/desktop-environment/tasks/hyprland.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/desktop-environment/tasks/hyprland.yml b/roles/desktop-environment/tasks/hyprland.yml index e93ae2b..15e6145 100644 --- a/roles/desktop-environment/tasks/hyprland.yml +++ b/roles/desktop-environment/tasks/hyprland.yml @@ -109,7 +109,7 @@ version: "v0.1.1" dest: "/usr/local/src/hyprgraphics" - repo: "https://github.com/hyprwm/Hyprland.git" - version: "v0.47.1" + version: "v0.47.2" dest: "/usr/local/src/Hyprland" - name: Build hyprutils From 1cde4df3889bd039dd59106ab6972e5279182e35 Mon Sep 17 00:00:00 2001 From: BluemediaDev Date: Tue, 4 Feb 2025 17:54:50 +0100 Subject: [PATCH 2/3] Add config for WezTerm --- roles/desktop-environment/files/.wezterm.lua | 8 ++++++++ roles/desktop-environment/tasks/config.yml | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 roles/desktop-environment/files/.wezterm.lua diff --git a/roles/desktop-environment/files/.wezterm.lua b/roles/desktop-environment/files/.wezterm.lua new file mode 100644 index 0000000..e326eff --- /dev/null +++ b/roles/desktop-environment/files/.wezterm.lua @@ -0,0 +1,8 @@ +local wezterm = require 'wezterm' +local config = wezterm.config_builder() + +config.default_prog = { '/usr/bin/zsh', '-l' } +config.color_scheme = "Argonaut (Gogh)" +config.window_background_opacity = 0.8 + +return config \ No newline at end of file diff --git a/roles/desktop-environment/tasks/config.yml b/roles/desktop-environment/tasks/config.yml index 370c233..a1951ae 100644 --- a/roles/desktop-environment/tasks/config.yml +++ b/roles/desktop-environment/tasks/config.yml @@ -30,6 +30,8 @@ loop: - src: "{{ role_path }}/files/.config" dest: "{{ ansible_env.HOME }}/" + - src: "{{ role_path }}/files/.wezterm.lua" + dest: "{{ ansible_env.HOME }}/" - name: Ensure presence of required directories file: From 7b40954d009bb31d9c37c539e6729564724f3857 Mon Sep 17 00:00:00 2001 From: BluemediaDev Date: Tue, 4 Feb 2025 18:10:47 +0100 Subject: [PATCH 3/3] Add zsh and Oh My Zsh --- roles/desktop-environment/files/.zshrc | 101 +++++++++++++++++++++ roles/desktop-environment/tasks/config.yml | 2 + roles/desktop-environment/tasks/utils.yml | 16 +++- 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 roles/desktop-environment/files/.zshrc diff --git a/roles/desktop-environment/files/.zshrc b/roles/desktop-environment/files/.zshrc new file mode 100644 index 0000000..234404a --- /dev/null +++ b/roles/desktop-environment/files/.zshrc @@ -0,0 +1,101 @@ +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="agnoster" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" diff --git a/roles/desktop-environment/tasks/config.yml b/roles/desktop-environment/tasks/config.yml index a1951ae..b4e3462 100644 --- a/roles/desktop-environment/tasks/config.yml +++ b/roles/desktop-environment/tasks/config.yml @@ -32,6 +32,8 @@ dest: "{{ ansible_env.HOME }}/" - src: "{{ role_path }}/files/.wezterm.lua" dest: "{{ ansible_env.HOME }}/" + - src: "{{ role_path }}/files/.zshrc" + dest: "{{ ansible_env.HOME }}/" - name: Ensure presence of required directories file: diff --git a/roles/desktop-environment/tasks/utils.yml b/roles/desktop-environment/tasks/utils.yml index c75845c..761b64d 100644 --- a/roles/desktop-environment/tasks/utils.yml +++ b/roles/desktop-environment/tasks/utils.yml @@ -29,4 +29,18 @@ - polkit-kde-agent-1 - slurp - grim - - swappy \ No newline at end of file + - swappy + +- name: Install zsh + become: yes + apt: + state: present + install_recommends: false + name: zsh + register: zsh_installation + +- name: Install Oh My Zsh + ansible.builtin.command: + cmd: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + chdir: "{{ ansible_env.HOME }}" + when: zsh_installation is changed \ No newline at end of file