From 5901141cc37e9519f24df5d6ef39e7fc45c9b115 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Mon, 7 Apr 2025 05:38:03 -0500 Subject: [PATCH] update --- .config/nvim/lazy-lock.json | 34 ++++++++----------- .config/nvim/lazyvim.json | 1 + ansible/devpod.yml | 5 ++- ansible/local.yml | 2 +- ansible/roles/devpod/tasks/main.yml | 20 +++++++++++ .../{packages => devpod}/vars/devpod.yml | 0 ansible/roles/packages/tasks/main.yml | 20 ++++------- ansible/scripts/install_brew.yml | 10 +++--- 8 files changed, 51 insertions(+), 41 deletions(-) create mode 100644 ansible/roles/devpod/tasks/main.yml rename ansible/roles/{packages => devpod}/vars/devpod.yml (100%) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3a65fcb..eb42129 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,52 +1,48 @@ { "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, - "SchemaStore.nvim": { "branch": "main", "commit": "e659e0c6ca06727ed898aaaeea3850f528898684" }, - "blink.cmp": { "branch": "main", "commit": "49f211fe5d729df53df4c042d7c3464cf47d199e" }, + "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, - "codecompanion.nvim": { "branch": "main", "commit": "88111765a8d7d1f9b359f74bb6ec44e4c0f5f0b2" }, - "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" }, + "codecompanion.nvim": { "branch": "main", "commit": "8e231abc2d2b27f848da970d370ba735e1d9f2c4" }, + "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" }, - "gitsigns.nvim": { "branch": "main", "commit": "3c76f7fabac723aa682365ef782f88a83ccdb4ac" }, - "gopher.nvim": { "branch": "main", "commit": "9d28cdebf1593517fd91ab4f9d35569d8da2ba7f" }, - "grug-far.nvim": { "branch": "main", "commit": "9411a99390014231753bbb7a2afe6886fda99257" }, + "fzf-lua": { "branch": "main", "commit": "98fb51f2820ead2f8e3c37a7071d7a113b07e2c1" }, + "gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" }, + "gopher.nvim": { "branch": "main", "commit": "9db5931af1293ae52500921d92c02145d86df02c" }, + "grug-far.nvim": { "branch": "main", "commit": "6ef402861468c6bd987155be17a34ba4291dc1d0" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" }, + "lualine.nvim": { "branch": "master", "commit": "834a5817f7e2be22a7062620032d49c600c35fab" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "neo-tree.nvim": { "branch": "main", "commit": "69f798bf9493b84df660ac3c6b2fc03e23956d25" }, + "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, + "neo-tree.nvim": { "branch": "main", "commit": "73d63376352ac731379892e27ac7b3d9449148e3" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-ansible": { "branch": "main", "commit": "bba61168b7aef735e7f950fdfece5ef6c388eacf" }, "nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" }, "nvim-dap-go": { "branch": "main", "commit": "605911fa0899882b05a8e4369ab12739620494af" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, - "nvim-lint": { "branch": "master", "commit": "81e8ba7655cc4395b1092ef4e1b6e83f54cd54ad" }, - "nvim-lspconfig": { "branch": "master", "commit": "40f120c10ea4b87311175539a183c3b75eab95a3" }, + "nvim-lint": { "branch": "master", "commit": "e7b4ffa6ab763af012e38b21af2c9159f10d2d33" }, + "nvim-lspconfig": { "branch": "master", "commit": "442e077e326ac467daf9cd63e72120fb450a850b" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "master", "commit": "997288c55253e27f782d991099490f80205d65bf" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, + "nvim-treesitter": { "branch": "master", "commit": "205faba1768a6e4c854f156bc6a21a41b242599c" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "powershell.nvim": { "branch": "main", "commit": "2e37888fba1d4fb09b6993c9d26bb53a05bac801" }, - "render-markdown.nvim": { "branch": "main", "commit": "d2285137fa4fbc0b4152cb444008166962b727b5" }, + "render-markdown.nvim": { "branch": "main", "commit": "a615baed85137a8c6fc8e95f5545f64d33f5f384" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "telescope-terraform-doc.nvim": { "branch": "main", "commit": "28efe1f3cb2ed4c83fa69000ae8afd2f85d62826" }, - "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" }, "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-tmux-navigator": { "branch": "master", "commit": "791dacfcfc8ccb7f6eb1c853050883b03e5a22fe" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 44cb92b..191fc16 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -1,5 +1,6 @@ { "extras": [ + "lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.lang.docker", "lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.markdown" diff --git a/ansible/devpod.yml b/ansible/devpod.yml index ccb8459..08e9ab1 100644 --- a/ansible/devpod.yml +++ b/ansible/devpod.yml @@ -2,7 +2,6 @@ connection: local become: true vars: - DEVPOD: true - + USER: vscode roles: - - packages + - devpod diff --git a/ansible/local.yml b/ansible/local.yml index 54ee31b..d7f06fd 100644 --- a/ansible/local.yml +++ b/ansible/local.yml @@ -3,7 +3,7 @@ become: true vars: GITLAB_TOKEN: "{{ lookup('env', 'GITLAB_TOKEN') }}" - DEVPOD: false + USER: user # vars_prompt: roles: diff --git a/ansible/roles/devpod/tasks/main.yml b/ansible/roles/devpod/tasks/main.yml new file mode 100644 index 0000000..b397abe --- /dev/null +++ b/ansible/roles/devpod/tasks/main.yml @@ -0,0 +1,20 @@ +- name: Load devpod variables if DEVPOD is true + include_vars: "vars/devpod.yml" + +- name: install apt + include_tasks: "./scripts/install_apt.yml" + +- name: install brew + include_tasks: "./scripts/install_brew.yml" + + #- name: install go + # include_tasks: "./scripts/install_go.yml" + +- name: install go apps + include_tasks: "./scripts/install_goapps.yml" + +- name: configure bat + include_tasks: "./scripts/configure_bat.yml" + +- name: trust internal certs + include_tasks: "./scripts/install_local_ca.yml" diff --git a/ansible/roles/packages/vars/devpod.yml b/ansible/roles/devpod/vars/devpod.yml similarity index 100% rename from ansible/roles/packages/vars/devpod.yml rename to ansible/roles/devpod/vars/devpod.yml diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml index fea29fa..80ff2b2 100644 --- a/ansible/roles/packages/tasks/main.yml +++ b/ansible/roles/packages/tasks/main.yml @@ -1,17 +1,11 @@ -- name: Load devpod variables if DEVPOD is true +- name: Load a variable file include_vars: "{{ item }}" with_first_found: - - "vars/devpod.yml" - when: DEVPOD + - "vars/{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml" + - "vars/{{ ansible_distribution }}.yml" + - "vars/{{ ansible_os_family }}.yml" + - "vars/defaults.yml" -#- name: Load a variable file -# include_vars: "{{ item }}" -# with_first_found: -# - "vars/{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml" -# - "vars/{{ ansible_distribution }}.yml" -# - "vars/{{ ansible_os_family }}.yml" -# - "vars/defaults.yml" -# when: not DEVPOD - -- name: +- name: "load tasks" include_tasks: "defaults.yml" + diff --git a/ansible/scripts/install_brew.yml b/ansible/scripts/install_brew.yml index 38f9d3f..264cf38 100644 --- a/ansible/scripts/install_brew.yml +++ b/ansible/scripts/install_brew.yml @@ -13,7 +13,7 @@ - not install_homebrew_if_missing - name: Installing Homebrew - become_user: vscode + become_user: "{{ USER }}" shell: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" when: - required_packages_brew is defined @@ -21,7 +21,7 @@ - install_homebrew_if_missing - name: Load Brew shellenv - become_user: vscode + become_user: "{{ USER }}" shell: eval "$(/home/linuxbrew/.linuxbrew/bin brew shellenv)" when: - required_packages_brew is defined @@ -29,21 +29,21 @@ - install_homebrew_if_missing - name: Install Brew Taps - become_user: vscode + become_user: "{{ USER }}" community.general.homebrew_tap: name: "{{ item }}" with_items: "{{ required_taps }}" when: required_taps is defined - name: Install Brew Casks - become_user: vscode + become_user: "{{ USER }}" community.general.homebrew_cask: name: "{{ item }}" with_items: "{{ required_packages_casks }}" when: required_packages_casks is defined - name: Install Brew Packages - become_user: vscode + become_user: "{{ USER }}" community.general.homebrew: name: "{{ required_packages_brew }}" when: required_packages_brew is defined