From 1e41741ac95eaa12cc190ae0504339c101cf65cb Mon Sep 17 00:00:00 2001 From: starr-dusT Date: Tue, 27 Dec 2022 18:02:39 -0800 Subject: [PATCH] many updates, but mostly removed bitwarden-cli for rbw --- additional-setup.md | 4 --- home/bin/executable_rbw-get | 11 ++++++++ home/dot_config/chezmoi/chezmoi.toml | 2 ++ home/dot_config/mimeapps.list | 5 ++++ home/dot_config/nvim/lua/tstarr/packer.lua | 5 ++++ .../vdirsyncer/config_calendar.tmpl | 6 ++--- .../vdirsyncer/config_contacts.tmpl | 6 ++--- home/dot_nbrc | 27 +++++++++++++++++++ home/dot_zshrc | 3 --- provision/tasks/desktop/packages.yml | 7 ----- provision/tasks/system/packages.yml | 1 + 11 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 home/bin/executable_rbw-get create mode 100644 home/dot_config/chezmoi/chezmoi.toml create mode 100644 home/dot_config/mimeapps.list create mode 100644 home/dot_nbrc diff --git a/additional-setup.md b/additional-setup.md index 52f860ca..3876e4f9 100644 --- a/additional-setup.md +++ b/additional-setup.md @@ -77,10 +77,6 @@ sudo make PREFIX=/usr install Download a release [here](https://github.com/kdheepak/taskwarrior-tui) and move to /usr/bin. -## PWA for Bitwarden - -The default Bitwarden application kind of sucks so I use a [PWA plugin](https://github.com/filips123/PWAsForFirefox). Follow instructions to install rpm and adjust ID in i3 config to launch correct PWA for Bitwarden. - ## display manager (or lack thereof) I disable gdm and login from tty diff --git a/home/bin/executable_rbw-get b/home/bin/executable_rbw-get new file mode 100644 index 00000000..a9f9c396 --- /dev/null +++ b/home/bin/executable_rbw-get @@ -0,0 +1,11 @@ +#!/bin/bash + +# rbw-get +# Ex: rbw-get google url + +if [[ "$2" == "Password" ]] +then + rbw get "$1" +else + rbw get "$1" --full | grep "$2" | cut -d ' ' -f 2- +fi diff --git a/home/dot_config/chezmoi/chezmoi.toml b/home/dot_config/chezmoi/chezmoi.toml new file mode 100644 index 00000000..b09f2176 --- /dev/null +++ b/home/dot_config/chezmoi/chezmoi.toml @@ -0,0 +1,2 @@ +[secret] + command = "rbw-get" diff --git a/home/dot_config/mimeapps.list b/home/dot_config/mimeapps.list new file mode 100644 index 00000000..90daa80a --- /dev/null +++ b/home/dot_config/mimeapps.list @@ -0,0 +1,5 @@ +[Default Applications] +text/html=firefox.desktop; +x-scheme-handler/http=firefox.desktop; +x-scheme-handler/https=firefox.desktop; + diff --git a/home/dot_config/nvim/lua/tstarr/packer.lua b/home/dot_config/nvim/lua/tstarr/packer.lua index 5507bef3..c427183d 100644 --- a/home/dot_config/nvim/lua/tstarr/packer.lua +++ b/home/dot_config/nvim/lua/tstarr/packer.lua @@ -19,6 +19,11 @@ return require('packer').startup(function(use) use ('mbbill/undotree') use ('kdheepak/lazygit.nvim') + use({ "iamcco/markdown-preview.nvim", + run = "cd app && npm install", + setup = function() vim.g.mkdp_filetypes = { "markdown" } end, + ft = { "markdown" }, + }) -- LSP use ('neovim/nvim-lspconfig') use ('hrsh7th/cmp-nvim-lsp') diff --git a/home/dot_config/vdirsyncer/config_calendar.tmpl b/home/dot_config/vdirsyncer/config_calendar.tmpl index e1b4f802..5b6c7d8e 100644 --- a/home/dot_config/vdirsyncer/config_calendar.tmpl +++ b/home/dot_config/vdirsyncer/config_calendar.tmpl @@ -15,6 +15,6 @@ fileext = ".ics" [storage personal_calendar_remote] type = "caldav" -url = "{{ (bitwardenFields "item" "98975280-32ee-4929-ae49-af7401888f67").url.value }}" -username = "{{ (bitwarden "item" "98975280-32ee-4929-ae49-af7401888f67").login.username }}" -password = "{{ (bitwarden "item" "98975280-32ee-4929-ae49-af7401888f67").login.password }}" +url = "{{ (secret "Vdirsyncer - Calendar" "url") }}" +username = "{{ (secret "Vdirsyncer - Calendar" "Username") }}" +password = "{{ (secret "Vdirsyncer - Calendar" "Password") }}" diff --git a/home/dot_config/vdirsyncer/config_contacts.tmpl b/home/dot_config/vdirsyncer/config_contacts.tmpl index f4d0bd31..750e87c5 100644 --- a/home/dot_config/vdirsyncer/config_contacts.tmpl +++ b/home/dot_config/vdirsyncer/config_contacts.tmpl @@ -14,6 +14,6 @@ fileext = ".vcf" [storage personal_contacts_remote] type = "carddav" -url = "{{ (bitwardenFields "item" "17646363-f639-4c2f-8895-af75000653ab").url.value }}" -username = "{{ (bitwarden "item" "17646363-f639-4c2f-8895-af75000653ab").login.username }}" -password = "{{ (bitwarden "item" "17646363-f639-4c2f-8895-af75000653ab").login.password }}" +url = "{{ (secret "Vdirsyncer - Contacts" "url") }}" +username = "{{ (secret "Vdirsyncer - Contacts" "Username") }}" +password = "{{ (secret "Vdirsyncer - Contacts" "Password") }}" diff --git a/home/dot_nbrc b/home/dot_nbrc new file mode 100644 index 00000000..333913dc --- /dev/null +++ b/home/dot_nbrc @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +############################################################################### +# .nbrc +# +# Configuration file for `nb`, a command line note-taking, bookmarking, +# and knowledge base application with encryption, search, Git-backed syncing, +# and more in a single portable script. +# +# Edit this file manually or manage settings using the `nb settings` +# subcommand. Configuration options are set as environment variables, eg: +# export NB_ENCRYPTION_TOOL=gpg +# +# https://github.com/xwmx/nb +############################################################################### + +export EDITOR="nvim" # Set by `nb` • Mon Dec 26 11:55:11 PM PST 2022 +export NB_INDICATOR_AUDIO=" " +export NB_INDICATOR_BOOKMARK=" " +export NB_INDICATOR_DOCUMENT=" " +export NB_INDICATOR_EBOOK=" " +export NB_INDICATOR_ENCRYPTED=" " +export NB_INDICATOR_FOLDER=" " +export NB_INDICATOR_IMAGE="盛" +export NB_INDICATOR_PINNED="車" +export NB_INDICATOR_TODO=" " +export NB_INDICATOR_TODO_DONE=" " +export NB_INDICATOR_VIDEO=" " diff --git a/home/dot_zshrc b/home/dot_zshrc index 1f1ba196..8257083c 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -124,6 +124,3 @@ alias te='trash-empty' alias tl='trash-list' alias tre='trash-restore' alias trm='trash-rm' - -# bitwarden-cli -alias bu='export BW_SESSION=$( bw unlock --raw )' # unlock and export bitwarden session diff --git a/provision/tasks/desktop/packages.yml b/provision/tasks/desktop/packages.yml index 3189586c..fc847c6b 100644 --- a/provision/tasks/desktop/packages.yml +++ b/provision/tasks/desktop/packages.yml @@ -39,13 +39,6 @@ - com.github.tchx84.Flatseal # Manage Flatpak permissions state: present become: true - -- name: Install bitwarden - unarchive: - src: "https://vault.bitwarden.com/download/?app=cli&platform=linux" - dest: /home/{{ user }}/bin - remote_src: true - mode: 0755 - name: Install desktop python packages ansible.builtin.pip: diff --git a/provision/tasks/system/packages.yml b/provision/tasks/system/packages.yml index db7fc393..e87e60d0 100644 --- a/provision/tasks/system/packages.yml +++ b/provision/tasks/system/packages.yml @@ -17,6 +17,7 @@ - elogind - rsync - unzip + - mimeo state: present become: true