From 3ca5bd7ecab084c788eccec2089275f22d46e4da Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Wed, 26 Feb 2025 09:16:16 +0100 Subject: [PATCH] refactor: add support for Fedora desktop environment installation and update flake.lock --- .../tasks/workstations/workstation.yml | 20 +++++++++++++++++++ config/home-manager/flake.lock | 18 ++++++++--------- secrets/ssh_config/prod.conf.gpg | 13 ++++++------ 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/config/ansible/tasks/workstations/workstation.yml b/config/ansible/tasks/workstations/workstation.yml index 2900a91..4954772 100644 --- a/config/ansible/tasks/workstations/workstation.yml +++ b/config/ansible/tasks/workstations/workstation.yml @@ -16,6 +16,26 @@ ansible.builtin.import_tasks: tasks/workstations/1password.yml become: true +- name: Check if distro is Fedora (Workstation) + ansible.builtin.command: cat /etc/os-release + register: os_release + changed_when: false + failed_when: false + +- name: Ensure desktop environment is installed + # dnf install switchdesk switchdesk-gui + # and + # dnf install @deepin-desktop-environment + # are required for Deepin Desktop Environment + ansible.builtin.package: + name: + - switchdesk + - switchdesk-gui + - "@deepin-desktop-environment" + state: present + when: os_release.stdout.find('Fedora Linux') != -1 + become: true + - name: Ensure common packages are installed ansible.builtin.package: name: diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index 65ebb7a..cb64cbc 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { diff --git a/secrets/ssh_config/prod.conf.gpg b/secrets/ssh_config/prod.conf.gpg index ce730e2..0342f51 100644 --- a/secrets/ssh_config/prod.conf.gpg +++ b/secrets/ssh_config/prod.conf.gpg @@ -1,9 +1,10 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMILwzTWNDBbZX/0sAeAQMlmiKRJM5YPtC78LvlLroqE5R6hysJq1nGV34U -CcY7XmuLz/Bvx2/ZGE1urY48AmgNZraiKOh8kfTG5T7dCTqrkMiz1MpNRYVdnXvW -LOanl3+alv6tmosD52zn4vRmRCnIaqE/k6ne+NV4BuRj0u9qWLoNI/7uGFnjcvI3 -mGYlDF7ArQH0gVpmW8wmlNFzMPe4ccqWMjGbpB1h3TEALy4nh2wwNH5PvF1FKesJ -iq4Vvhslo8LbyjQdkA7/fPlYEu1MDJKDCaHWwmAevMwNuGNLrdupyOf2KkHSYmUB -=ULsR +jA0ECQMI0mEBmFqEkrD/0sAmAft3invRcP2/pvBEXC8Fl9HJRkcwpkOMtiJyZlty +3G8aDlURlMCX8gTl7qSEPMmkSiEQQXNv+zaRj4G3gdkfqxq7Rupt7vJmy4l6Mmg5 +14w7FSehf8ms7o55mxwFLvijILfJPH6pOFGFfXnuTuSrK1Rh+Rw+gtW+PojTEzzU +5AZ6qKabCsiFbmjXoT5e8Qb5wdX8P4XLRckug81ptQ6rKct/GQJI3p7ZYEcpiPLX +wsXlFgQ5WBa9lnSRD6xIw56sGFddHYtQYttQe8fIZgyFeCfeEEmUWSEEJUUSPsPJ +HXmg43GdTKY= +=S35s -----END PGP MESSAGE-----