diff --git a/flake.lock b/flake.lock index 5d478f7..bb67e24 100644 --- a/flake.lock +++ b/flake.lock @@ -73,15 +73,15 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "narHash": "sha256-BMN2Sf1yuv5pw2koZZdMCCaghUYyo0hOtxY/v2zmiL8=", - "rev": "76e468cd74a08edcbabb14ce1698ebd2f5fad9d2", - "revCount": 1581, + "narHash": "sha256-0dZpggYjjmWEk+rGixiBHOHuQfLzEzNfrtjSig04s6Q=", + "rev": "9ccae1754eec0341b640d5705302ac0923d22875", + "revCount": 1618, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1581%2Brev-76e468cd74a08edcbabb14ce1698ebd2f5fad9d2/018a425b-5c00-7475-80f5-a86f7ba6808e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1618+rev-9ccae1754eec0341b640d5705302ac0923d22875/018aea4c-03c9-7734-95d5-b84cc8881e3d/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://api.flakehub.com/f/nix-community/fenix/0.1.1565.tar.gz" + "url": "https://flakehub.com/f/nix-community/fenix/0.1.1565.tar.gz" } }, "fh": { @@ -92,11 +92,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "narHash": "sha256-DWuGtjwz3cIR1IxJV8Kwm7vn2LijGGuPX8TOcwFvWXc=", - "rev": "c1b3308d60944c851e53df5eafd2384edec24178", - "revCount": 240, + "narHash": "sha256-Pbw1yggqIzmY23DuxrmSSf9IbOy5olAqVWectq97j20=", + "rev": "4cd8c02f1fdafceee67602203d9672ae1b256946", + "revCount": 287, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.5/018aadd0-e626-7807-abc0-756fc529f996/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.6/018b00f0-e7c5-7bc1-9eff-4921edc6e8c6/source.tar.gz" }, "original": { "type": "tarball", @@ -348,15 +348,15 @@ }, "nixpkgs": { "locked": { - "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", - "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", - "revCount": 519597, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "revCount": 534806, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.519597%2Brev-a999c1cc0c9eb2095729d5aa03e0d8f7ed256780/018a3d35-4db5-76c3-aca2-de1920cf506f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.534806+rev-5e4c2ada4fcd54b99d56d7bd62f384511a7e2593/018b29e9-ae6d-72f2-993b-19cb9a64a3b5/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://api.flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz" } }, "nixpkgs-lib": { diff --git a/home-manager/_mixins/emacs/burd.org b/home-manager/_mixins/emacs/burd.org index bb5de98..ce6660a 100644 --- a/home-manager/_mixins/emacs/burd.org +++ b/home-manager/_mixins/emacs/burd.org @@ -223,7 +223,7 @@ (setq frame-title-format '(buffer-file-name "%f" ("%b"))) (set-face-attribute 'default nil :family "Fira Code" - :size 12 + :height 134 :weight 'normal :width 'normal) @@ -693,8 +693,7 @@ (global-set-key (kbd "M-X") 'smex-major-mode-commands) #+end_src *** Ido - =Ido= mode provides a nice way to navigate the filesystem. This is - mostly just turning it on. + =Ido= mode provides a nice way to navigate the filesystem. #+begin_src emacs-lisp (ido-mode t) (setq ido-enable-flex-matching t @@ -910,7 +909,7 @@ Use =dockerfile-mode= for =Dockerfile= files. #+begin_src emacs-lisp (require 'dockerfile-mode) - (add-to-list 'auto-mode-alist '("^Dockerfile" . dockerfile-mode)) + (add-to-list 'auto-mode-alist '("^Dockerflie$" . dockerfile-mode)) #+end_src *** make :PROPERTIES: diff --git a/home-manager/_mixins/emacs/init.el b/home-manager/_mixins/emacs/init.el index c54478f..a66d3db 100644 --- a/home-manager/_mixins/emacs/init.el +++ b/home-manager/_mixins/emacs/init.el @@ -5,7 +5,7 @@ ;; You may delete these explanatory comments. (package-initialize) -(require 'org-install) +(require 'org) (require 'ob-tangle) (org-babel-load-file (expand-file-name "burd.org" user-emacs-directory)) (custom-set-variables diff --git a/home-manager/_mixins/emacs/vendor/ditaa0_9.jar b/home-manager/_mixins/emacs/vendor/ditaa0_9.jar new file mode 100644 index 0000000..5894de4 Binary files /dev/null and b/home-manager/_mixins/emacs/vendor/ditaa0_9.jar differ diff --git a/home-manager/_mixins/emacs/vendor/markdown.css b/home-manager/_mixins/emacs/vendor/markdown.css new file mode 100644 index 0000000..1b535d7 --- /dev/null +++ b/home-manager/_mixins/emacs/vendor/markdown.css @@ -0,0 +1,260 @@ +body{ + margin: 0 auto; + font-family: Georgia, Palatino, serif; + color: #444444; + line-height: 1; + max-width: 960px; + padding: 30px; +} +h1, h2, h3, h4 { + color: #111111; + font-weight: 400; +} +h1, h2, h3, h4, h5, p { + margin-bottom: 24px; + padding: 0; +} +h1 { + font-size: 48px; +} +h2 { + font-size: 36px; + /* The bottom margin is small. It's designed to be used with gray meta text + * below a post title. */ + margin: 24px 0 6px; +} +h3 { + font-size: 24px; +} +h4 { + font-size: 21px; +} +h5 { + font-size: 18px; +} +a { + color: #0099ff; + margin: 0; + padding: 0; + vertical-align: baseline; +} +a:hover { + text-decoration: none; + color: #ff6600; +} +a:visited { + color: purple; +} +ul, ol { + padding: 0; + margin: 0; +} +li { + line-height: 24px; +} +li ul, li ul { + margin-left: 24px; +} +p, ul, ol { + font-size: 16px; + line-height: 24px; + max-width: 540px; +} +pre { + padding: 0px 24px; + max-width: 800px; + white-space: pre-wrap; +} +code { + font-family: Consolas, Monaco, Andale Mono, monospace; + line-height: 1.5; + font-size: 13px; +} +aside { + display: block; + float: right; + width: 390px; +} +blockquote { + border-left:.5em solid #eee; + padding: 0 2em; + margin-left:0; + max-width: 476px; +} +blockquote cite { + font-size:14px; + line-height:20px; + color:#bfbfbf; +} +blockquote cite:before { + content: '\2014 \00A0'; +} + +blockquote p { + color: #666; + max-width: 460px; +} +hr { + width: 540px; + text-align: left; + margin: 0 auto 0 0; + color: #999; +} + +/* Code below this line is copyright Twitter Inc. */ + +button, +input, +select, +textarea { + font-size: 100%; + margin: 0; + vertical-align: baseline; + *vertical-align: middle; +} +button, input { + line-height: normal; + *overflow: visible; +} +button::-moz-focus-inner, input::-moz-focus-inner { + border: 0; + padding: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} +input[type=checkbox], input[type=radio] { + cursor: pointer; +} +/* override default chrome & firefox settings */ +input:not([type="image"]), textarea { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +label, +input, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: normal; + margin-bottom: 18px; +} +input[type=checkbox], input[type=radio] { + cursor: pointer; + margin-bottom: 0; +} +input[type=text], +input[type=password], +textarea, +select { + display: inline-block; + width: 210px; + padding: 4px; + font-size: 13px; + font-weight: normal; + line-height: 18px; + height: 18px; + color: #808080; + border: 1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +select, input[type=file] { + height: 27px; + line-height: 27px; +} +textarea { + height: auto; +} + +/* grey out placeholders */ +:-moz-placeholder { + color: #bfbfbf; +} +::-webkit-input-placeholder { + color: #bfbfbf; +} + +input[type=text], +input[type=password], +select, +textarea { + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); +} +input[type=text]:focus, input[type=password]:focus, textarea:focus { + outline: none; + border-color: rgba(82, 168, 236, 0.8); + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); +} + +/* buttons */ +button { + display: inline-block; + padding: 4px 14px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + line-height: 18px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + background-color: #0064cd; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); + background-image: -moz-linear-gradient(top, #049cdb, #0064cd); + background-image: -ms-linear-gradient(top, #049cdb, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); + background-image: -o-linear-gradient(top, #049cdb, #0064cd); + background-image: linear-gradient(top, #049cdb, #0064cd); + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border: 1px solid #004b9a; + border-bottom-color: #003f81; + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + transition: 0.1s linear all; + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +button:hover { + color: #fff; + background-position: 0 -15px; + text-decoration: none; +} +button:active { + -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); +} +button::-moz-focus-inner { + padding: 0; + border: 0; +} diff --git a/home-manager/_mixins/emacs/vendor/plantuml.jar b/home-manager/_mixins/emacs/vendor/plantuml.jar new file mode 100644 index 0000000..10d2b75 Binary files /dev/null and b/home-manager/_mixins/emacs/vendor/plantuml.jar differ