diff --git a/flake.lock b/flake.lock index b49b563..5d478f7 100644 --- a/flake.lock +++ b/flake.lock @@ -100,7 +100,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/fh/%2A.tar.gz" } }, "firefox-addons": { diff --git a/home-manager/_mixins/emacs/burd.org b/home-manager/_mixins/emacs/burd.org index 58c8e00..bb5de98 100644 --- a/home-manager/_mixins/emacs/burd.org +++ b/home-manager/_mixins/emacs/burd.org @@ -54,9 +54,9 @@ ; nrepl ac-slime ag - ; auto-complete - ; autopair - cc-guess + ;; auto-complete + ;; electric-pair-mode + ;; cc-guess cc-mode cmake-mode coffee-mode @@ -64,7 +64,7 @@ company-c-headers company-cmake deft - ; dockerfile-mode + dockerfile-mode elixir-mix elixir-mode eredis @@ -223,8 +223,8 @@ (setq frame-title-format '(buffer-file-name "%f" ("%b"))) (set-face-attribute 'default nil :family "Fira Code" + :size 12 :weight 'normal - :size 14 :width 'normal) (when (functionp 'set-fontset-font) @@ -712,11 +712,11 @@ (setq backup-directory-alist `((".*" . ,temporary-file-directory))) (setq auto-save-file-name-transforms `((".*" ,temporary-file-directory t))) #+end_src -*** autopair-mode +*** electric-pair-mode This makes sure that brace structures =(), [], {}=, etc. are closed as soon as the opening character is typed. #+begin_src emacs-lisp - ; (require 'autopair) + ;(require 'electric-pair-mode) #+end_src *** Power lisp A bunch of tweaks for programming in LISP dialects. It defines the @@ -753,8 +753,8 @@ *** auto-complete Turn on auto complete. #+begin_src emacs-lisp - ; (require 'auto-complete-config) - ; (ac-config-default) + ;(require 'auto-complete-config) + ;(ac-config-default) #+end_src *** Indentation and buffer cleanup This re-indents, untabifies, and cleans up whitespace. It is stolen @@ -909,8 +909,8 @@ :END: Use =dockerfile-mode= for =Dockerfile= files. #+begin_src emacs-lisp - ; (require 'dockerfile-mode) - ; (add-to-list 'auto-mode-alist '("^Dockerflie$" . dockerfile-mode)) + (require 'dockerfile-mode) + (add-to-list 'auto-mode-alist '("^Dockerfile" . dockerfile-mode)) #+end_src *** make :PROPERTIES: diff --git a/home-manager/_mixins/users/gburd/NOTES b/home-manager/_mixins/users/gburd/NOTES new file mode 100644 index 0000000..392dde7 --- /dev/null +++ b/home-manager/_mixins/users/gburd/NOTES @@ -0,0 +1,17 @@ + file.".local/share/applications/emacs.desktop".text = '' + [Desktop Entry] + Version=1.0 + Categories=Utility;Development;TextEditor; + Comment=View and edit files + Exec=env XLIB_SKIP_ARGB_VISUALS=1 emacs -a "" %F + #Exec=/usr/bin/emacsclient -c -a "" %F + GenericName=Text Editor + Icon=/usr/share/icons/hicolor/scalable/apps/emacs.svg + MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; + Name=Emacs (Client) + Name[en_US]=Emacs (Client) + StartupWMClass=Emacs + Terminal=false + TryExec=emacs + Type=Application + ''; diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix index 52aad2f..c0ea30e 100644 --- a/home-manager/_mixins/users/gburd/default.nix +++ b/home-manager/_mixins/users/gburd/default.nix @@ -65,29 +65,22 @@ iso="nixos-desktop/nixos.iso" ''; - file.".local/share/applications/emacs.desktop".text = '' - [Desktop Entry] - Version=1.0 - Categories=Utility;Development;TextEditor; - Comment=View and edit files - Exec=env XLIB_SKIP_ARGB_VISUALS=1 emacs -c -a "" %F - #Exec=/usr/bin/emacsclient -c -a "" %F - GenericName=Text Editor - Icon=/usr/share/icons/hicolor/scalable/apps/emacs.svg - MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; - Name=Emacs (Client) - Name[en_US]=Emacs (Client)% - StartupWMClass=Emacs - Terminal=false - TryExec=emacs - Type=Application - ''; - file.".inputrc".text = '' "\C-v": "" set enable-bracketed-paste off ''; + file.".config/direnv/direnv.toml".text = '' + [global] + load_dotenv = true + ''; + + # file.".config/sublime-text-2/Local/License.sublime_license".text = + # config.sops.secrets.sublime-licenses.text.path; + + # file.".config/sublime-merge/Local/License.sublime_license".text = + # config.sops.secrets.sublime-licenses.merge.path; + # A Modern Unix experience # https://jvns.ca/blog/2022/04/12/a-list-of-new-ish--command-line-tools/ packages = with pkgs; [ @@ -148,6 +141,10 @@ yq-go # Terminal `jq` for YAML emacs + nvi + file + tig + ripgrep plocate ]; sessionVariables = { diff --git a/nixos/_mixins/desktop/chromium-extensions.nix b/nixos/_mixins/desktop/chromium-extensions.nix index 5e7dffe..2f0835b 100644 --- a/nixos/_mixins/desktop/chromium-extensions.nix +++ b/nixos/_mixins/desktop/chromium-extensions.nix @@ -9,6 +9,7 @@ _: { "gebbhagfogifgggkldgodflihgfeippi" # Return YouTube Dislike "edlifbnjlicfpckhgjhflgkeeibhhcii" # Screenshot Tool "chphlpgkkbolifaimnlloiipkdnihall" # OneTab + "aeblfdkhhhdcdjpifhhbdiojplfjncoa" # 1Password ]; }; }; diff --git a/nixos/_mixins/desktop/chromium.nix b/nixos/_mixins/desktop/chromium.nix index 0dadc22..95119fa 100644 --- a/nixos/_mixins/desktop/chromium.nix +++ b/nixos/_mixins/desktop/chromium.nix @@ -9,6 +9,7 @@ extensions = [ "cdglnehniifkbagbbombnjghhcihifij" # kagi-search-for-chrome "ghmbeldphafepmbegfdlkpapadhbakde" # proton-pass-free-password + "aeblfdkhhhdcdjpifhhbdiojplfjncoa" # 1Password ]; extraOpts = { "AutofillAddressEnabled" = false; diff --git a/nixos/_mixins/secrets.yaml b/nixos/_mixins/secrets.yaml index 2b150ec..70a60fd 100644 --- a/nixos/_mixins/secrets.yaml +++ b/nixos/_mixins/secrets.yaml @@ -1,4 +1,7 @@ gburd-password: ENC[AES256_GCM,data:HFgg11lJrsrdHYBGOCWYDkFkE8aRPW++Q8Yhw6QeqbFmmFqx9NVo5WFQCa2dVT9uLDhCLN3uDbMgOrcwtRBxP58byOSQtCo895PqV4ICa/+s00ZrWXpD3oeMNNlqfIGtbw5Iq8CUkFBMDA==,iv:U/+fOgtpynPhyJN8F1pVljzzp/EcTlQVcdSaPeAp6Oc=,tag:8OeZ2C+UB1cF63Zx76RBMQ==,type:str] +sublime-licenses: + text: ENC[AES256_GCM,data:tjkf3PpbbnfvYi2fdsB6JX3gh5R1M1CIFto4QyYZzuXKr84XPQPPIvPQw+Uyzf+t++z7QG1FbvC15CTfuQWZzt5pU4EWMyiND9IPA2c39l2z+BZLyk3m+92/rhmPylU+jB90hZz7DhgzUXaXpMhHN9EF9z8wL9SFRDr6HGfFX1JR8x4XS4dk6b6kXKORtwHi0kJCsLwAjdKaVrlw6vGgDyYy7FTP5ZZa62JVzz+X08UmMkM98slivM691nJU6FvF9+UDlBE7U+2PGa9RF7y7qj0YO0pGrVf4pctfv/ssjPvByuTq39PXifvas6kRErHGTPgvQPz9uDYqzP6hw/S5fIiw+XDIBpExz1TKaeCEmmTDnVY2ViRGYqLFfoS3XdTlruiNtGkIruv8AGQCEsqt3FxXoO8kZ/dOWrJ4gqd7iqWPrIy9p14J8tMSCz86fU/PfCsemk0df2zCxgO3xiAZSHxx+hL5a+YEj5dyWouZC83Xht0GhIcUo1A8Q3q1BLbauQcJ2ZgNRDcF,iv:ut/h/DFDvFCKccEAGWyC9OfC/YOa8nNT/cBbxAPOzzs=,tag:KFyD5GjMbO4n3oPxgEdfng==,type:str] + merge: ENC[AES256_GCM,data:Dz44UaqEcVAJtqJPXhT+q30FVfY43Ahsrspc+pz+XOjyxvFFgQF3e7HyeSrM8UVik0aYx5yT34IiduIYDq+KNVtq8Q+Jac0j6ielvQsOn4QVbDkJog8ydd45b+C9sV0kVF9eFcja8JsXvUxiNL/Z5ZvXAe5bhYp/kx+3C1O76WxjH5XWe+51orJq2cY4SLasNieJqnp2AoUCc4PC9y/aXSpJu8bU+LQibcvau/RHogsF5lw9cEM5oNqb/FPRpOIVIiqWBY8adRugSCtPvC062AHKcUu8tFCyzUwgO1uhBti7lkmXEoyHdjzpfuTN+JQLMlsQt4q5or3kz7DJ4K1SptcHxVnVPSb5yt2lPW/wrBusQR0gU9JzBjmuZMVwwca0U4o4oFAmWQz6fgHRLDhvx7cEPYqLI5w4W0jvZvAgtI2OXhqu1XKvyC4XkFMGf6c37kOc8iY2J+1x2FGMpKYy9Zwd/giSrSamNS7e1Bspx00MqLIbMzOFxqKxl8l3+gLETreeOJCTelpg,iv:pPtexa+/lhkmaDvscwhk6RKL6N41igNtftBNy8WNPIE=,tag:3MRH9LoF1vcNIr76cWu5KQ==,type:str] sops: kms: [] gcp_kms: [] @@ -14,8 +17,8 @@ sops: SXIzUTBLQklXemM4anBNdnhhMGc5V2sKmIExI6uv2EgL2WTuBITlc98uAN4SQBDL kj6f8gQtJCXTyWFyZxcR1Z1f8q53R1ZmsKJv9a3oD4bx9riTjauC7w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-09-24T19:58:35Z" - mac: ENC[AES256_GCM,data:oarapuONmPho6htg2U5wh1SR7PjpYKVkSfI0pJRvsSqNiPYY+euRTSm7aZYC4rxwgWSvMkwsqZtoHnZox0Aw1BrEEoZZrne1nI94wquc0ubGLZg1R117iUFZUwSe3JoA9vZIgP/mGZ2yyJcmqIwFog3BUSfW2gN0S11sF6Gzozs=,iv:AikPqPuVHTdrYkReXHO4qv+ByrPfwz0PKXWkxa/cFZ8=,tag:l82987HvZjxXDbm7kjeVmQ==,type:str] + lastmodified: "2023-10-03T14:08:52Z" + mac: ENC[AES256_GCM,data:aara96dcSHaQbN1u+GdSEWApe0hWLxLa4TiqSkUk4Q5wft+1lcBXl8NNQNOY0p6nYZ4TdrBaRjakJocbCnQ4b2HSbRxY0w/wxO3ziaAdcghnEBBGsQ1KpP2GtDzP39rsGUjYgY7Lq0jgQ2yWH5/uOwCRcGdfA05VDcT7xSsrISU=,iv:ektoBdOSL9sSs+mI0HuCUvfegciELDAkPETIHDVky7c=,tag:MDXfa4Z3+BS5r5M7q5L9Hg==,type:str] pgp: - created_at: "2023-09-22T14:23:05Z" enc: |-