From 9017f97a6d071d6ea72ed7123190a8a9e72a749d Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 1 Oct 2024 00:51:46 +0200 Subject: [PATCH] Aggiunto supporto per nix, alacritty e kitty. --- roles/alacritty/files/alacritty.terminfo | 55 ++++++++++++++++++++++++ roles/alacritty/tasks/main.yml | 17 ++++++++ roles/dotfiles/meta/main.yml | 3 ++ roles/kitty/files/xterm-kitty.terminfo | 52 ++++++++++++++++++++++ roles/kitty/tasks/main.yml | 17 ++++++++ roles/nix/defaults/main.yml | 2 + roles/nix/tasks/configuration.yml | 17 ++++++++ roles/nix/tasks/install/archlinux.yml | 7 +++ roles/nix/tasks/install/debian.yml | 9 ++++ roles/nix/tasks/install/generic.yml | 18 ++++++++ roles/nix/tasks/main.yml | 21 +++++++++ 11 files changed, 218 insertions(+) create mode 100644 roles/alacritty/files/alacritty.terminfo create mode 100644 roles/alacritty/tasks/main.yml create mode 100644 roles/kitty/files/xterm-kitty.terminfo create mode 100644 roles/kitty/tasks/main.yml create mode 100644 roles/nix/defaults/main.yml create mode 100644 roles/nix/tasks/configuration.yml create mode 100644 roles/nix/tasks/install/archlinux.yml create mode 100644 roles/nix/tasks/install/debian.yml create mode 100644 roles/nix/tasks/install/generic.yml create mode 100644 roles/nix/tasks/main.yml diff --git a/roles/alacritty/files/alacritty.terminfo b/roles/alacritty/files/alacritty.terminfo new file mode 100644 index 0000000..92f0db1 --- /dev/null +++ b/roles/alacritty/files/alacritty.terminfo @@ -0,0 +1,55 @@ +# Reconstructed via infocmp from file: /usr/share/terminfo/a/alacritty +alacritty|alacritty terminal emulator, + am, bce, ccc, hs, mc5i, mir, msgr, npc, xenl, + colors#0x100, cols#80, it#8, lines#24, pairs#0x10000, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, + clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=\r, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, + dl=\E[%p1%dM, dl1=\E[M, dsl=\E]2;\007, ech=\E[%p1%dX, + ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, + fsl=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, + ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, + indn=\E[%p1%dS, + initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, + invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kDC=\E[3;2~, + kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, + kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, kb2=\EOE, kbs=^?, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\EOP, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, + kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, + kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, + kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, + kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, + kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~, + kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, + kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, + kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, + kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, + kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, + kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, + kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~, + kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~, + kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, + kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, + kf8=\E[19~, kf9=\E[20~, khome=\EOH, kich1=\E[2~, + kind=\E[1;2B, kmous=\E[<, knp=\E[6~, kpp=\E[5~, + kri=\E[1;2A, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El, + memu=\Em, oc=\E]104\007, op=\E[39;49m, rc=\E8, + rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, + rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, + rmcup=\E[?1049l\E[23;0;0t, rmir=\E[4l, rmkx=\E[?1l\E>, + rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, + rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, + smcup=\E[?1049h\E[22;0;0t, smir=\E[4h, smkx=\E[?1h\E=, + smm=\E[?1034h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n, + u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd, diff --git a/roles/alacritty/tasks/main.yml b/roles/alacritty/tasks/main.yml new file mode 100644 index 0000000..41ee2a1 --- /dev/null +++ b/roles/alacritty/tasks/main.yml @@ -0,0 +1,17 @@ +--- +# installing compatibility with kitty + +- name: Copying terminfo settings + ansible.builtin.copy: + src: alacritty.terminfo + dest: /tmp/alacritty.terminfo + +- name: Setting up terminfo for kitty + ansible.builtin.shell: >- + tic -xe alacritty,alacritty-direct /tmp/alacritty.terminfo + become: true + +- name: Removing now useless terminfo + ansible.builtin.file: + path: /tmp/alacritty.terminfo + state: absent diff --git a/roles/dotfiles/meta/main.yml b/roles/dotfiles/meta/main.yml index 874aef6..de48476 100644 --- a/roles/dotfiles/meta/main.yml +++ b/roles/dotfiles/meta/main.yml @@ -5,6 +5,9 @@ dependencies: - pip - rsync - rclone + - kitty + - alacritty + - nix - zsh - antidote - tmux diff --git a/roles/kitty/files/xterm-kitty.terminfo b/roles/kitty/files/xterm-kitty.terminfo new file mode 100644 index 0000000..f50df43 --- /dev/null +++ b/roles/kitty/files/xterm-kitty.terminfo @@ -0,0 +1,52 @@ +# Reconstructed via infocmp from file: /usr/lib/kitty/terminfo/x/xterm-kitty +xterm-kitty|KovIdTTY, + am, ccc, hs, km, mc5i, mir, msgr, npc, xenl, + colors#0x100, cols#80, it#8, lines#24, pairs#0x7fff, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, + clear=\E[H\E[2J, cnorm=\E[?12h\E[?25h, cr=\r, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, + dl=\E[%p1%dM, dl1=\E[M, dsl=\E]2;\E\\, ech=\E[%p1%dX, + ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, + fsl=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, + ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, + indn=\E[%p1%dS, + initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, + kBEG=\E[1;2E, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, + kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, + kRIT=\E[1;2C, ka1=, ka3=, kbeg=\EOE, kbs=^?, kc1=, kc3=, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kdch1=\E[3~, kend=\EOF, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, + kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[13;2~, + kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, + kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, + kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, + kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[13;5~, kf28=\E[1;5S, + kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~, + kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, + kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, + kf39=\E[13;6~, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, + kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, + kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, + kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, + kf51=\E[13;3~, kf52=\E[1;3S, kf53=\E[15;3~, + kf54=\E[17;3~, kf55=\E[18;3~, kf56=\E[19;3~, + kf57=\E[20;3~, kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, + kf60=\E[24;3~, kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[13;4~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=, khome=\EOH, + kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~, + kpp=\E[5~, kri=\E[1;2A, kund=, oc=\E]104\007, op=\E[39;49m, + rc=\E8, rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, + rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, + rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m, + rmul=\E[24m, rs1=\E]\E\\\Ec, sc=\E7, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, + smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n, + u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd, diff --git a/roles/kitty/tasks/main.yml b/roles/kitty/tasks/main.yml new file mode 100644 index 0000000..703a48f --- /dev/null +++ b/roles/kitty/tasks/main.yml @@ -0,0 +1,17 @@ +--- +# installing compatibility with kitty + +- name: Copying terminfo settings + ansible.builtin.copy: + src: xterm-kitty.terminfo + dest: /tmp/xterm-kitty.terminfo + +- name: Setting up terminfo for kitty + ansible.builtin.shell: >- + tic -xe xterm-kitty /tmp/xterm-kitty.terminfo + become: true + +- name: Removing now useless terminfo + ansible.builtin.file: + path: /tmp/xterm-kitty.terminfo + state: absent diff --git a/roles/nix/defaults/main.yml b/roles/nix/defaults/main.yml new file mode 100644 index 0000000..acd7660 --- /dev/null +++ b/roles/nix/defaults/main.yml @@ -0,0 +1,2 @@ +--- +dotfdir: "{{ lookup('ansible.builtin.env', 'HOME' ) }}/.dotfiles" diff --git a/roles/nix/tasks/configuration.yml b/roles/nix/tasks/configuration.yml new file mode 100644 index 0000000..79296d7 --- /dev/null +++ b/roles/nix/tasks/configuration.yml @@ -0,0 +1,17 @@ +--- +# Configuring the nix installation. + +- name: Adding syntaxerrormmm to nix-users + ansible.builtin.user: + name: syntaxerrormmm + groups: nix-users + append: true + become: true + +- name: Adding configuration to local user + ansible.builtin.file: + src: "{{ dotfdir }}/nix" + dest: "{{ lookup('ansible.builtin.env', 'HOME' ) }}/.config/nix" + state: link + owner: syntaxerrormmm + group: syntaxerrormmm diff --git a/roles/nix/tasks/install/archlinux.yml b/roles/nix/tasks/install/archlinux.yml new file mode 100644 index 0000000..704d6a4 --- /dev/null +++ b/roles/nix/tasks/install/archlinux.yml @@ -0,0 +1,7 @@ +--- +- name: (arch) Installing nix from package management + community.general.pacman: + name: nix + state: present + update_cache: true + become: true diff --git a/roles/nix/tasks/install/debian.yml b/roles/nix/tasks/install/debian.yml new file mode 100644 index 0000000..67003ae --- /dev/null +++ b/roles/nix/tasks/install/debian.yml @@ -0,0 +1,9 @@ +--- +- name: (deb) installing nix from package manager + ansible.builtin.apt: + name: + - nix-bin + - nix-setup-systemd + state: present + update_cache: true + become: true diff --git a/roles/nix/tasks/install/generic.yml b/roles/nix/tasks/install/generic.yml new file mode 100644 index 0000000..171b6b4 --- /dev/null +++ b/roles/nix/tasks/install/generic.yml @@ -0,0 +1,18 @@ +--- +# Generic installation, multiuser +# Needs systemd, no SELinux and sudo + +- name: Download nix installation script + ansible.builtin.get_url: + url: https://nixos.org/nix/install + dest: /tmp/nixinstall + mode: "0755" + +- name: Running installer + ansible.builtin.shell: /tmp/nixinstall --daemon + become: true + +- name: Removing install script + ansible.builtin.file: + path: /tmp/nixinstall + state: absent diff --git a/roles/nix/tasks/main.yml b/roles/nix/tasks/main.yml new file mode 100644 index 0000000..68192cb --- /dev/null +++ b/roles/nix/tasks/main.yml @@ -0,0 +1,21 @@ +--- +# Installing and configuring nix. + +- name: Installation + ansible.builtin.include_tasks: "install/{{ ansible_os_family | lower }}.yml" + when: ansible_os_family == 'Archlinux' or ansible_os_family == 'Debian' + args: + apply: + tags: + - nix + - nix-install + tags: + - nix + - nix-install + +- name: Configuration + ansible.builtin.import_tasks: configuration.yml + when: ansible_os_family == 'Archlinux' or ansible_os_family == 'Debian' + tags: + - nix + - nix-config