diff --git a/local.yml b/local.yml index 657ad84..407cdba 100644 --- a/local.yml +++ b/local.yml @@ -2,6 +2,7 @@ - hosts: localhost connection: local become: true + vars_prompt: roles: - packages diff --git a/roles/customize/tasks/defaults.yml b/roles/customize/tasks/defaults.yml index 55f0499..7133078 100644 --- a/roles/customize/tasks/defaults.yml +++ b/roles/customize/tasks/defaults.yml @@ -27,12 +27,12 @@ owner: root group: root - #- name: set gnome config - # become_user: user - # dconf: - # key: "{{ item.key }}" - # value: "{{ item.value }}" - # with_items: "{{ dconf }}" +- name: set gnome config + become_user: user + dconf: + key: "{{ item.key }}" + value: "{{ item.value }}" + with_items: "{{ dconf }}" - name: check if dotfiles is installed become_user: user diff --git a/roles/customize/vars/defaults.yml b/roles/customize/vars/defaults.yml index cfc106c..c22f640 100644 --- a/roles/customize/vars/defaults.yml +++ b/roles/customize/vars/defaults.yml @@ -1,8 +1,8 @@ dconf: - # - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings', value: "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/']"} - # - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding', value: "'t'"} - # - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command', value: "'terminator'"} - # - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name', value: "'Terminal'"} + - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings', value: "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/']"} + - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding', value: "'t'"} + - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command', value: "'terminator'"} + - {key: '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name', value: "'Terminal'"} # - {key: '/org/gnome/desktop/wm/keybindings/close', value: "['F4']"} # - {key: '/org/gnome/desktop/wm/keybindings/switch-to-workspace-left', value: "['Left']"} # - {key: '/org/gnome/desktop/wm/keybindings/switch-to-workspace-right', value: "['Right']"} @@ -21,20 +21,20 @@ dconf: # #- {key: '/org/gnome/desktop/interface/font-name', value: "'FuraMono Nerd Font 11'"} # #- {key: '/org/gnome/desktop/wm/preferences/titlebar-font', value: "'FuraMono Nerd Font 11'"} # - {key: '/org/gnome/desktop/sound', value: "true"} - # - {key: '/org/gnome/shell/favorite-apps', value: "['io.gitlab.librewolf-community.desktop', 'brave-browser.desktop', 'terminator.desktop', 'org.gnome.Nautilus.desktop']"} + - {key: '/org/gnome/shell/favorite-apps', value: "['pop-cosmic-applications.desktop', 'io.gitlab.librewolf-community.desktop', 'com.brave.Browser.desktop', 'terminator.desktop', 'org.gnome.Nautilus.desktop']"} # - {key: '/org/gnome/shell/enabled-extensions', value: "['pop-shell@system76.com','dash-to-dock@micxgx.gmail.com', 'system76-power@system76.com']"} - # - {key: '/org/gnome/shell/extensions/pop-shell/tile-by-default', value: "true"} - # - {key: '/org/gnome/shell/extensions/pop-shell/gap-inner', value: "uint32 1"} - # - {key: '/org/gnome/shell/extensions/pop-shell/gap-outer', value: "uint32 1"} - # - {key: '/org/gnome/shell/extensions/pop-shell/pop-workspace-down', value: "@as []"} - # - {key: '/org/gnome/shell/extensions/pop-shell/pop-workspace-up', value: "@as []"} + - {key: '/org/gnome/shell/extensions/pop-shell/tile-by-default', value: "true"} + - {key: '/org/gnome/shell/extensions/pop-shell/gap-inner', value: "uint32 1"} + - {key: '/org/gnome/shell/extensions/pop-shell/gap-outer', value: "uint32 1"} + # - {key: '/org/gnome/shell/extensions/pop-shell/pop-workspace-down', value: "['Down','J']"} + # - {key: '/org/gnome/shell/extensions/pop-shell/pop-workspace-up', value: "['Up','K',]"} # - {key: '/org/gnome/shell/extensions/dash-to-dock/dash-max-icon-size', value: "32"} # - {key: '/org/gnome/shell/extensions/dash-to-dock/show-trash', value: "false"} # - {key: '/org/gnome/shell/extensions/dash-to-dock/show-mounts', value: "false"} # - {key: '/org/gnome/shell/extensions/dash-to-dock/apply-custom-theme', value: "true"} # - {key: '/org/gnome/shell/extensions/dash-to-dock/multi-monitor', value: "true"} # - {key: '/org/gnome/desktop/peripherals/touchpad', value: "false"} - # #s- {key: '/org/gnome/desktop/default-applications/terminal', value: "'exec /usr/bin/terminator'"} + - {key: '/org/gnome/desktop/default-applications/terminal', value: "'exec /usr/bin/terminator'"} # - {key: '/org/gnome/mutter/keybindings/toggle-tiled-left', value: "@as []"} # - {key: '/org/gnome/mutter/keybindings/toggle-tiled-right', value: "@as []"} # - {key: '/org/gnome/desktop/peripherals/touchpad/natural-scroll', value: "false"} diff --git a/roles/nix/defaults/main.yml b/roles/nix/defaults/main.yml deleted file mode 100644 index 93c4d5e..0000000 --- a/roles/nix/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -nix_version: 2.16.1 -installer_checksum: sha512:4edf245baf9641843b6bb750a1889e0266bace6df03cf90845c9c6279db4a3c2d1d100de446550658be84ac9b6b15017b05cd792cb6ee5da7ab74b79b215fd47 -flakes: false -nix_commands: [] diff --git a/roles/nix/tasks/main.yml b/roles/nix/tasks/main.yml deleted file mode 100644 index 92c59d1..0000000 --- a/roles/nix/tasks/main.yml +++ /dev/null @@ -1,108 +0,0 @@ - ---- -- name: Get nix version - shell: | - . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh - nix --version - ignore_errors: true - changed_when: false - register: nix_version_output -- name: Set nix version name - set_fact: - nix_version_on_system: "{{ (nix_version_output.stdout_lines[0] | split(' '))[2] }}" - when: nix_version_output.rc == 0 -- name: Download and run installer - block: - - name: Download installer - get_url: - url: "{{ installer_path }}" - dest: /tmp - checksum: "{{ installer_checksum }}" - - name: extract installer - unarchive: - src: /tmp/{{ nix_build }}.tar.xz - remote_src: true - dest: /tmp/ - - name: Uninistall the previous nix - block: - - name: disable nix socket - service: - name: nix-daemon.socket - state: stopped - enabled: false - become: true - ignore_errors: true - - name: disable nix service - service: - name: nix-daemon.service - state: stopped - enabled: false - become: true - ignore_errors: true - - name: Remove Installed nix files - file: - state: absent - path: /nix - become: true - - name: Remove Installed nix config files - file: - state: absent - path: /etc/nix - become: true - - name: stat bash.bashrc.backup-before-nix - stat: - path: /etc/bash.bashrc.backup-before-nix - register: bash_bashrc_backup_stat - - name: Restore bash.bashrc - shell: mv /etc/bash.bashrc.backup-before-nix /etc/bash.bashrc - become: true - when: bash_bashrc_backup_stat.stat.exists - - name: stat bashrc.backup-before-nix - stat: - path: /etc/bashrc.backup-before-nix - register: bashrc_backup_stat - - name: Restore bashrc - shell: mv /etc/bashrc.backup-before-nix /etc/bashrc - become: true - when: bashrc_backup_stat.stat.exists - - name: stat zshrc.backup-before-nix - stat: - path: /etc/zshrc.backup-before-nix - register: zshrc_backup_stat - - name: Restore zshrc - shell: mv /etc/zshrc.backup-before-nix /etc/zshrc - become: true - when: zshrc_backup_stat.stat.exists - - name: stat nix.sh - stat: - path: /etc/profile.d/nix.sh.backup-before-nix - register: nixsh_backup_stat - - name: Restore nix.sh - shell: mv /etc/profile.d/nix.sh.backup-before-nix /etc/profile.d/nix.sh - become: true - when: nixsh_backup_stat.stat.exists - when: nix_version_on_system is defined and nix_version_on_system != nix_version - - name: Run the installer - become: true - ansible.builtin.shell: - cmd: ./install --daemon