Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
],
"depNameTemplate": "{{{packageName}}}",
"datasourceTemplate": "git-refs",
"currentValueTemplate": "develop"
"currentValueTemplate": "main"
},
{
"customType": "regex",
Expand Down
22 changes: 11 additions & 11 deletions roles/colorscheme/tasks/gnome-terminal.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
- name: "Git Clone arcticicestudio/nord-gnome-terminal"
- name: "Git Clone catppuccin/gnome-terminal"
ansible.builtin.git:
repo: https://github.com/arcticicestudio/nord-gnome-terminal.git
dest: "{{ ansible_facts['env'].HOME }}/.nord-gnome-terminal"
version: c15b85a5389cf3bfd37fe409e915a88ecf902640
register: colorscheme_nord_gnome_terminal_repo
repo: https://github.com/catppuccin/gnome-terminal.git
dest: "{{ ansible_facts['env'].HOME }}/.catppuccin-gnome-terminal"
version: 75e57457f58a34baf2ec7d9e13556ca53d598395
register: colorscheme_catppuccin_gnome_terminal_repo

- name: "Install Nord Color Scheme For Gnome Terminal" # noqa: no-handler
- name: "Install Catppuccin Color Scheme For Gnome Terminal" # noqa: no-handler
ansible.builtin.command:
cmd: "dbus-run-session ./nord.sh"
chdir: "{{ ansible_facts['env'].HOME }}/.nord-gnome-terminal/src"
cmd: "dbus-run-session python3 install.py"
chdir: "{{ ansible_facts['env'].HOME }}/.catppuccin-gnome-terminal"
changed_when: true
when: colorscheme_nord_gnome_terminal_repo.changed
when: colorscheme_catppuccin_gnome_terminal_repo.changed

- name: "List Gnome Terminal Profile Ids"
ansible.builtin.shell:
Expand Down Expand Up @@ -47,6 +47,6 @@

- name: "Set Gnome Terminal Default Profile Id"
ansible.builtin.command:
cmd: "gsettings set org.gnome.Terminal.ProfilesList default '{{ colorscheme_gnome_terminal_profile_mappings['Nord'] }}'"
cmd: "gsettings set org.gnome.Terminal.ProfilesList default '{{ colorscheme_gnome_terminal_profile_mappings['Catppuccin Mocha'] }}'"
changed_when: true
when: colorscheme_gnome_terminal_default_profile_id.stdout != colorscheme_gnome_terminal_profile_mappings['Nord']
when: colorscheme_gnome_terminal_default_profile_id.stdout != colorscheme_gnome_terminal_profile_mappings['Catppuccin Mocha']
26 changes: 9 additions & 17 deletions roles/colorscheme/tasks/iterm2-app.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
---
- name: "Git Clone arcticicestudio/nord-iterm2"
- name: "Git Clone catppuccin/iterm"
ansible.builtin.git:
repo: https://github.com/arcticicestudio/nord-iterm2.git
dest: "{{ ansible_facts['env'].HOME }}/.nord-iterm2"
version: 233a2462e04e07a9676386a52dad0c2ff6666d72
register: colorscheme_nord_iterm2_repo
repo: https://github.com/catppuccin/iterm.git
dest: "{{ ansible_facts['env'].HOME }}/.catppuccin-iterm"
version: b2936a6e55270fcc55421b1bb7d5fd194a489591
register: colorscheme_catppuccin_iterm_repo

- name: "Set Nord Color Scheme For Default iterm2 Profile" # noqa: no-handler
ansible.builtin.shell:
cmd: >-
/usr/libexec/PlistBuddy
-c "Add :'New Bookmarks' array"
-c "Add :'New Bookmarks':0 dict"
{{ colorscheme_iterm2_plist }} 2>/dev/null;
/usr/libexec/PlistBuddy
-c "Merge '{{ ansible_facts['env'].HOME }}/.nord-iterm2/src/xml/Nord.itermcolors' :'New Bookmarks':0"
{{ colorscheme_iterm2_plist }}
executable: /bin/bash
- name: "Import Catppuccin Mocha Color Scheme into iTerm2" # noqa: no-handler
ansible.builtin.command:
cmd: open "{{ ansible_facts['env'].HOME }}/.catppuccin-iterm/colors/catppuccin-mocha.itermcolors"
changed_when: true
when: colorscheme_nord_iterm2_repo.changed
when: colorscheme_catppuccin_iterm_repo.changed
2 changes: 1 addition & 1 deletion roles/gitconfig/files/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
dark = true
line-numbers = true
navigate = true
syntax-theme = Nord
syntax-theme = Catppuccin Mocha
[diff]
colorMoved = default
[init]
Expand Down
2 changes: 1 addition & 1 deletion roles/intellij/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ intellij_idea_plugins_dir:
intellij_idea_plugins:
- Key Promoter X
- com.anthropic.code.plugin
- com.arcticicestudio.nord.jetbrains
- com.github.catppuccin.jetbrains
- com.github.copilot
- google-java-format
- org.jetbrains.bazel
7 changes: 3 additions & 4 deletions roles/neovim/files/nvim/lua/plugins/colorscheme.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
return {
"nordtheme/vim",
name = "nord",
lazy = false,
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
config = function()
vim.cmd.colorscheme("nord")
vim.cmd.colorscheme("catppuccin-nvim")
end,
}
2 changes: 1 addition & 1 deletion roles/neovim/files/nvim/lua/plugins/statusline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ return {
config = function()
require("lualine").setup({
options = {
theme = "nord",
theme = "catppuccin-nvim",
},
})
end,
Expand Down
2 changes: 1 addition & 1 deletion roles/rustup/files/cargo.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export PATH="$HOME/.cargo/bin:$PATH"
export BAT_THEME='Nord'
export BAT_THEME='Catppuccin Mocha'
export PAGER='bat'
2 changes: 1 addition & 1 deletion roles/tmux/files/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -g monitor-bell on
set -g pane-active-border-style fg=magenta
set -g pane-border-style fg=brightblue
set -g renumber-windows on
set -g terminal-overrides ",$TERM:RGB"
set -as terminal-features ",xterm-256color:RGB"
set -g update-environment "TERM_PROGRAM TERM_PROGRAM_VERSION ITERM_SESSION_ID"
set -g visual-bell off

Expand Down
Loading