.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+  - repo: https://github.com/prettier/pre-commit
+    rev: v2.1.2
+    hooks:
+      - id: prettier
+  - repo: https://github.com/ansible/ansible-lint.git
+    rev: v4.2.0
+    hooks:
+      - id: ansible-lint
+        files: \.(yaml|yml)$

playbooks/roles/fedora/packages/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Upgrade all packages
   dnf:
-    name: '*'
+    name: "*"
     state: latest
 
 - name: Install playerctl and flameshot
@@ -12,4 +12,4 @@
     state: present
 
 - include: shell.yml
-- include: haskell.yml
+- include: haskell.yml

playbooks/roles/fedora/packages/tasks/shell.yml

@@ -6,4 +6,5 @@
       - tmux
       - neovim
       - emacs
-    state: present
+      - alacritty
+    state: present

playbooks/roles/fedora/repositories/tasks/main.yml

@@ -8,6 +8,7 @@
     name:
       - "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ fedora_version.stdout }}.noarch.rpm"
       - "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ fedora_version.stdout }}.noarch.rpm"
+    disable_gpg_check: yes
     state: present
 
 - name: Install Google Chrome repository
@@ -31,4 +32,4 @@
     - rpmfusion-free
     - rpmfusion-nonfree-updates-testing
     - rpmfusion-nonfree-updates
-    - rpmfusion-nonfree
+    - rpmfusion-nonfree

playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates-testing.repo.j2

@@ -29,4 +29,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2

@@ -29,4 +29,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2

@@ -31,4 +31,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates-testing.repo.j2

@@ -29,4 +29,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2

@@ -29,4 +29,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2

@@ -32,4 +32,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates-testing.repo.j2

@@ -28,4 +28,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2

@@ -28,4 +28,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2

@@ -30,4 +30,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates-testing.repo.j2

@@ -28,4 +28,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2

@@ -28,4 +28,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2

@@ -31,4 +31,3 @@ type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

playbooks/roles/fedora/upgrade/tasks/main.yml

@@ -7,7 +7,7 @@
 
 - name: Update all packages
   dnf:
-    name: '*'
+    name: "*"
     state: latest
 
 - name: Install system-upgrade plugin

playbooks/roles/git/tasks/main.yml

@@ -2,4 +2,4 @@
 - name: Create git config
   template:
     src: templates/gitconfig.j2
-    dest: ~/.gitconfig
+    dest: ~/.gitconfig

playbooks/roles/git/templates/gitconfig.j2

@@ -1,3 +1,6 @@
+[alias]
+	scommit = commit --signoff
+
 [commit]
 	gpgsign = true
 
@@ -14,6 +17,12 @@
 [gpg]
 	program = gpg2
 
+[init]
+	defaultBranch = main
+
+[pull]
+	rebase = true
+
 [user]
 	name       = Matej Focko
 	email      = {{ git_email }}

playbooks/roles/haskell/tasks/main.yml

@@ -12,4 +12,4 @@
 - name: Install HLint.hs
   template:
     src: templates/HLint.hs.j2
-    dest: ~/.ghc/HLint.hs
+    dest: ~/.ghc/HLint.hs

playbooks/roles/shell/tasks/alacritty.yml

@@ -0,0 +1,5 @@
+---
+- name: Install alacritty configuration
+  template:
+    src: templates/alacritty
+    dest: ~/.config/

playbooks/roles/shell/tasks/main.yml

@@ -6,10 +6,11 @@
     name: mfocko
     shell: /bin/zsh
 
-- name: Install Nord theme for Konsole
+# - name: Install Nord theme for Konsole
-  shell: wget -O ~/.local/share/konsole/nord.colorscheme https://raw.githubusercontent.com/arcticicestudio/nord-konsole/develop/src/nord.colorscheme
+#   shell: wget -O ~/.local/share/konsole/nord.colorscheme https://raw.githubusercontent.com/arcticicestudio/nord-konsole/develop/src/nord.colorscheme
 
 - include: nvim.yml
 - include: emacs.yml
 - include: zsh.yml
 - include: tmux.yml
+- include: alacritty.yml

playbooks/roles/shell/tasks/zsh.yml

@@ -19,7 +19,7 @@
     dest: ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
 
 - name: Clone starship
-  shell: sh -c "$(curl -fsSL https://starship.rs/install.sh)" "" -f
+  shell: sh -c "$(curl -fsSL https://starship.rs/install.sh)" "" -f -b $HOME/.local/bin
 
 - name: Create zshrc
   template:

playbooks/roles/shell/templates/alacritty/alacritty.yml

@@ -0,0 +1,28 @@
+import:
+  - /home/mfocko/.config/alacritty/colors/ayu_dark.yml
+
+env:
+  TERM: alacritty
+
+window:
+  dimensions:
+    columns: 107
+    lines: 30
+
+  dynamic_padding: true
+  decorations: none
+  startup_mode: Maximized
+
+font:
+  normal:
+    family: JetBrainsMonoNL Nerd Font
+  size: 13.0
+
+cursor:
+  # Block, Underline, Beam
+  style: Underline
+  thickness: 0.33
+
+key_bindings:
+  - key: F11
+    action: ToggleFullscreen

playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml

@@ -0,0 +1,25 @@
+# Ayu Dark
+colors:
+  primary:
+    foreground: "#b3b1ad"
+    background: "#0a0e14"
+
+  normal:
+    black: "#00010a"
+    blue: "#53bdfa"
+    cyan: "#90e1c6"
+    green: "#91b362"
+    magenta: "#fae994"
+    red: "#ea6c73"
+    white: "#c7c7c7"
+    yellow: "#f9af4f"
+
+  bright:
+    black: "#686868"
+    blue: "#59c2ff"
+    cyan: "#95e6cb"
+    green: "#c2d94c"
+    magenta: "#ffee99"
+    red: "#f07178"
+    white: "#ffffff"
+    yellow: "#ffb454"

playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml

@@ -0,0 +1,25 @@
+# Ayu Mirage
+colors:
+  primary:
+    foreground: "#cbccc6"
+    background: "#1f2430"
+
+  normal:
+    black: "#191e2a"
+    blue: "#6dcbfa"
+    cyan: "#90e1c6"
+    green: "#a6cc70"
+    magenta: "#cfbafa"
+    red: "#ed8274"
+    white: "#c7c7c7"
+    yellow: "#fad07b"
+
+  bright:
+    black: "#686868"
+    blue: "#73d0ff"
+    cyan: "#95e6cb"
+    green: "#bae67e"
+    magenta: "#d4bfff"
+    red: "#f28779"
+    white: "#ffffff"
+    yellow: "#ffd580"

playbooks/roles/shell/templates/alacritty/colors/default.yml

@@ -0,0 +1,27 @@
+colors:
+  # Default colors
+  primary:
+    background: "#333333"
+    foreground: "#F2F2F2"
+
+  # Normal colors
+  normal:
+    black: "#333333"
+    red: "#CC0000"
+    green: "#4E9A06"
+    yellow: "#C4A000"
+    blue: "#3465A4"
+    magenta: "#75507B"
+    cyan: "#06989A"
+    white: "#D3D7CF"
+
+  # Bright colors
+  bright:
+    black: "#88807C"
+    red: "#F15D22"
+    green: "#73C48F"
+    yellow: "#FFCE51"
+    blue: "#48B9C7"
+    magenta: "#AD7FA8"
+    cyan: "#34E2E2"
+    white: "#EEEEEC"

playbooks/roles/shell/templates/alacritty/colors/night_owl.yml

@@ -0,0 +1,26 @@
+# Night Owl
+colors:
+  primary:
+    foreground: "#d6deeb"
+    # background: '#011627' # for Night Owl
+    background: "#000000" # for Night Owl Black
+
+  normal:
+    black: "#011627"
+    blue: "#82AAFF"
+    cyan: "#21c7a8"
+    green: "#22da6e"
+    magenta: "#C792EA"
+    red: "#EF5350"
+    white: "#ffffff"
+    yellow: "#c5e478"
+
+  bright:
+    black: "#575656"
+    blue: "#82AAFF"
+    cyan: "#7fdbca"
+    green: "#22da6e"
+    magenta: "#C792EA"
+    red: "#EF5350"
+    white: "#ffffff"
+    yellow: "#ffeb95"

playbooks/roles/shell/templates/alacritty/colors/ocean.yml

@@ -0,0 +1,25 @@
+# Ocean
+colors:
+  primary:
+    foreground: "#8F93A2"
+    background: "#0F111A"
+
+  normal:
+    black: "#000000"
+    blue: "#3A75C4"
+    cyan: "#87D3F8"
+    green: "#14B37D"
+    magenta: "#703FAF"
+    red: "#E25822"
+    white: "#FFFFFF"
+    yellow: "#F2F27A"
+
+  bright:
+    black: "#3A75C4"
+    blue: "#3A75C4"
+    cyan: "#87D3F8"
+    green: "#14B37D"
+    magenta: "#703FAF"
+    red: "#E25822"
+    white: "#F3EFE0"
+    yellow: "#F2F27A"

playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml

@@ -0,0 +1,25 @@
+# Outrun Electric
+colors:
+  primary:
+    foreground: "#e4eeff"
+    background: "#090819"
+
+  normal:
+    black: "#283034"
+    red: "#ff2e97"
+    green: "#62a9cf"
+    yellow: "#ffd400"
+    blue: "#42c6ff"
+    magenta: "#ff2afc"
+    cyan: "#42c6ff"
+    white: "#d9e0e9"
+
+  bright:
+    black: "#435056"
+    red: "#ff2e97"
+    green: "#add0e5"
+    yellow: "#ffd400"
+    blue: "#42c6ff"
+    magenta: "#ff2afc"
+    cyan: "#42c6ff"
+    white: "#f4f6f9"

playbooks/roles/shell/templates/alacritty/colors/rainier.yml

@@ -0,0 +1,25 @@
+# Rainier
+colors:
+  primary:
+    foreground: "#b3c8dc"
+    background: "#171d23"
+
+  normal:
+    black: "#171d23"
+    blue: "#509ddb"
+    cyan: "#509ddb"
+    green: "#37c2b6"
+    magenta: "#b9346c"
+    red: "#b9346c"
+    white: "#b3c8dc"
+    yellow: "#c9c994"
+
+  bright:
+    black: "#627d96"
+    blue: "#509ddb"
+    cyan: "#509ddb"
+    green: "#37c2b6"
+    magenta: "#9d79d8"
+    red: "#b9346c"
+    white: "#f2f2f2"
+    yellow: "#d6af78"

playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml

@@ -0,0 +1,25 @@
+# Rainier - Retro
+colors:
+  primary:
+    foreground: "#b9d3e9"
+    background: "#201825"
+
+  normal:
+    black: "#201825"
+    blue: "#509ddb"
+    cyan: "#509ddb"
+    green: "#37c2b6"
+    magenta: "#b9346c"
+    red: "#b9346c"
+    white: "#b9d3e9"
+    yellow: "#c9c994"
+
+  bright:
+    black: "#7B6296"
+    blue: "#509ddb"
+    cyan: "#509ddb"
+    green: "#37c2b6"
+    magenta: "#9d79d8"
+    red: "#b9346c"
+    white: "#f2f2f2"
+    yellow: "#d6af78"

playbooks/roles/shell/templates/init.vim.j2

@@ -13,11 +13,11 @@
 " Then run vim and install the plugins using command in normal mode:
 "   :PlugInstall
 "
-" Most of the settings come from vimconfig.com. 
+" Most of the settings come from vimconfig.com.
 " We added few handy key mappings:
 "
-" Ctrl+Up/Down	    Move line or a block of selected lines  
+" Ctrl+Up/Down	    Move line or a block of selected lines
-" Ctrl+j/k	
+" Ctrl+j/k
 " <leader>pp	    Toggle paste mode on and off
 " <leader><cr>	    Disable search highlight
 "
@@ -80,7 +80,7 @@ if &term =~ '256color'
 	" render properly when inside 256-color tmux and GNU screen.
 	" see also http://snk.tuxfamily.org/log/vim-256color-bce.html
 	set t_ut=
-endif 
+endif
 
 " If you happen to still have a problem on some terminal, uncomment:
 " set t_Co=256
@@ -99,12 +99,12 @@ set textwidth=80	" Line wrap (number of cols)
 set showmatch		" Highlight matching brace
 set showcmd	    	" Show last command on right
 set cursorline 		" Highlight current line
- 
+
 set hlsearch		" Highlight all search results
 set smartcase		" Enable smart-case search
 set ignorecase		" Always case-insensitive
 set incsearch		" Searches for strings incrementally
- 
+
 set autoindent		" Auto-indent new lines
 set cindent		" Use 'C' style program indenting
 set shiftwidth=4	" Number of auto-indent spaces
@@ -113,7 +113,7 @@ set smarttab		" Enable smart-tabs
 set softtabstop=4 expandtab	" Number of spaces per Tab
 set wrap 		" Wrap lines
 
- 
+
 """""
 """"" Advanced
 """""

playbooks/roles/shell/templates/starship.toml.j2

@@ -1,5 +1,6 @@
 add_newline = false
-format = """$username\
+format = """${custom.toolbox}\
+$username\
 $hostname\
 $git_branch\
 $git_commit\
@@ -32,4 +33,9 @@ format = "[$path]($style)[$read_only]($read_only_style) "
 
 [character]
 success_symbol = "[%%](bold green)"
-error_symbol = "[%%](bold red)"
+error_symbol = "[%%](bold red)"
+
+[custom.toolbox]
+when = "ls /run/.containerenv"
+command = "echo ⬢"
+style = "bold purple"

playbooks/roles/shell/templates/tmux.conf.j2

@@ -34,4 +34,4 @@ set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @continuum-restore 'on'
 
-run '~/.tmux/plugins/tpm/tpm'
+run '~/.tmux/plugins/tpm/tpm'

playbooks/roles/shell/templates/tmux_status.conf.j2

@@ -7,4 +7,4 @@ set -g status-interval 1
 set -g status-justify centre
 set -g status-position top
 setw -g window-status-current-format '#[fg=colour2][#I|#W#F]'
-setw -g window-status-format '[#I|#W#F]'
+setw -g window-status-format '[#I|#W#F]'

playbooks/roles/ssh/templates/ssh_config.j2

@@ -34,4 +34,4 @@ Host git.mfocko.xyz
 Host git.gauss.mfocko.xyz
 	User		git
 	Hostname	git.gauss.mfocko.xyz
-	Port		2222
+	Port		2222

playbooks/roles/vscode/templates/code-url.desktop.j2

@@ -9,4 +9,4 @@ NoDisplay=true
 StartupNotify=true
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=x-scheme-handler/vscode-insiders;
-Keywords=vscode;
+Keywords=vscode;

playbooks/roles/vscode/templates/keybindings.json.j2

@@ -31,4 +31,4 @@
         "command": "workbench.action.terminal.focusPrevious",
         "when": "terminalFocus"
     }
-]
+]

playbooks/roles/vscode/templates/settings.json.j2

@@ -43,4 +43,4 @@
     "gitlens.views.repositories.location": "scm",
     "gitlens.views.search.location": "scm",
     "diffEditor.renderSideBySide": true
-}
+}

scripts/export_keys.sh

@@ -5,4 +5,4 @@ cat ~/.ssh/id_ed25519.pub
 
 echo ">>> Exporting public GPG key <<<"
 ID=$(gpg --list-secret-keys --keyid-format LONG | perl -n -e'/^sec.*\/(\w*)\s+/ && print $1')
-gpg --armor --export $ID
+gpg --armor --export $ID

scripts/generate_gpg.sh

@@ -7,4 +7,4 @@ ID=$(gpg --list-secret-keys --keyid-format LONG | perl -n -e'/^sec.*\/(\w*)\s+/
 echo ">>> ID: $ID <<<"
 
 echo ">>> Exporting public key <<<"
-gpg --armor --export $ID
+gpg --armor --export $ID