diff --git a/emacs-lisp/email.org b/emacs-lisp/email.org index 2d35860..6d9a0a7 100644 --- a/emacs-lisp/email.org +++ b/emacs-lisp/email.org @@ -28,11 +28,7 @@ Email is a complicated beast, I decided to use *mu4e* and *mbsync*. :END: #+BEGIN_SRC emacs-lisp :results none - (let* - ((mu-path - (file-name-directory (directory-file-name (file-name-directory (executable-find "mu"))))) - (mu-load-path (concat mu-path "share/emacs/site-lisp/mu4e/"))) - (add-to-list 'load-path mu-load-path)) + (add-to-list 'load-path (concat user-emacs-directory "profile/share/emacs/site-lisp/mu4e")) (require 'mu4e) (setq auth-sources '((:source "~/.password-store/.authinfo.gpg"))) diff --git a/emacs-lisp/org_mode.org b/emacs-lisp/org_mode.org index c1cbae4..7abb323 100644 --- a/emacs-lisp/org_mode.org +++ b/emacs-lisp/org_mode.org @@ -107,7 +107,7 @@ Adjust size of LaTeX previews. #+BEGIN_SRC emacs-lisp :results none (pcase (system-name) ("heater" (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.75))) - ("omen" (setq org-format-latex-options (plist-put org-format-latex-options :scale 0.8)))) + ("omen" (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.0)))) #+END_SRC To support non-breakable whitespace, create a new ~org-entity~. @@ -123,6 +123,13 @@ Enable fontification for inline LaTeX blocks which convieniently also makes in f (setq org-highlight-latex-and-related '(native entities)) #+end_src +Org Mode by default considers ~.aux~ files as log files and deletes them. Which among other things breaks ~tikzmark~ and ~babel~... + +#+begin_src emacs-lisp + (setq org-latex-logfiles-extensions (remove "aux" org-latex-logfiles-extensions)) +#+end_src + + ** Sliced Previews diff --git a/flake.lock b/flake.lock index e1b2386..12e29a0 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1688544596, - "narHash": "sha256-/rbDM71Qpj4gMp54r9mQ2AdD10jEMtnrQ3b2Xf+HYTU=", + "lastModified": 1695864092, + "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=", "owner": "nix-community", "repo": "disko", - "rev": "fc3c3817c9f1fcd405463c6a7f0f98baab97c692", + "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1687747614, - "narHash": "sha256-KXspKgtdO2YRL12Jv0sUgkwOwHrAFwdIG/90pDx8Ydg=", + "lastModified": 1694710969, + "narHash": "sha256-5nMY+3JF/ktW8D8URataP6MCbbnID13P4CixARNoq6w=", "owner": "nix-community", "repo": "disko", - "rev": "fef67a1ddc293b595d62a660f57deabbcb70ff95", + "rev": "91af5b4a53ee8e57f4178ef58036dce49fbda91a", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1662486847, - "narHash": "sha256-HBgQB8jzmpBTHAdPfCtLnxVhHSzI3XtSfcMW2TZ0KN8=", + "lastModified": 1692722907, + "narHash": "sha256-CgPVVqALgqxOoZOgBZ0PD6qAuGpr9+YgwRPSMVfxoOM=", "owner": "edolstra", "repo": "dwarffs", - "rev": "1f850df9c932acb95da2f31b576a8f6c7c188376", + "rev": "1ca3b9298931fc26a5e7d471d5ffee69b90f9ea1", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1687762428, - "narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "37dd7bb15791c86d55c5121740a1887ab55ee836", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -399,22 +399,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", - "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", - "type": "github" - }, - "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -432,7 +416,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -450,7 +434,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1631561581, "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", @@ -464,7 +448,7 @@ "type": "indirect" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -482,7 +466,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -531,6 +515,43 @@ "type": "github" } }, + "ghc980": { + "flake": false, + "locked": { + "lastModified": 1692910316, + "narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", + "ref": "ghc-9.8", + "rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", + "revCount": 61566, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99": { + "flake": false, + "locked": { + "lastModified": 1695427505, + "narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", + "ref": "refs/heads/master", + "rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", + "revCount": 61951, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -572,11 +593,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1690417628, - "narHash": "sha256-3sBLEKjNN8SwiugswBSaYW31FtCwhbIY50ThJ+kFSks=", + "lastModified": 1695860572, + "narHash": "sha256-/HJL7ub2Kx0mQEouK6YMmlr2B8olrWOACRh5RRhHaaI=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "cc909ca55279b8c10f8a26982548381977cdd014", + "rev": "bd042193699709029bd963abd132b96e11127d5d", "type": "github" }, "original": { @@ -593,11 +614,13 @@ "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "ghc980": "ghc980", + "ghc99": "ghc99", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.2": "hls-2.2", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -616,11 +639,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1690419091, - "narHash": "sha256-f5x8PNvWKeQXOOh5FWa57RyBf+IZVm5H25aGasrBDQI=", + "lastModified": 1695862185, + "narHash": "sha256-SXgQRBn8MlHvZi8fL4vlbXpJb/0GlgtmKesZ08NPd18=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "228fede8816459e021acfbd735136f423b1af42a", + "rev": "caceca15e51685985b007283f7c00d2c2162e9fb", "type": "github" }, "original": { @@ -679,16 +702,33 @@ "type": "github" } }, + "hls-2.2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1688999869, - "narHash": "sha256-gLD2UI6+Nb9JV5Wh4FnLHAZwLMiY11RHYBKmBZCxLXc=", + "lastModified": 1695738267, + "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a6d1d954b81caf4c9291b8ac35452fef842f289b", + "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "type": "github" }, "original": { @@ -756,11 +796,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1688517130, - "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", "ref": "hkm/remote-iserv", - "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", - "revCount": 13, + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -852,15 +892,15 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1694176289, - "narHash": "sha256-246x9Nem9+6V9r7SX+t0dX1qTU2f3e2dfDtmQ+WAQYs=", + "lastModified": 1695847632, + "narHash": "sha256-RXDg0N2e8YYVKkQt7BE40y03QxYEYds4/+HrwpIMPoM=", "owner": "astro", "repo": "microvm.nix", - "rev": "25460d97cffffe24f565a9d654c4aab1848598b4", + "rev": "67bf176ff48141292a66d8bce541463ee49d0fb5", "type": "github" }, "original": { @@ -887,16 +927,16 @@ }, "nil": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1688959909, - "narHash": "sha256-vDZuhJ9/iTJnjwUDAWaRThWV1mH9NAY9IGJwztPkbYA=", + "lastModified": 1695485017, + "narHash": "sha256-aQyRBJnT4tftexM/Y3etfOk8tfMFZzt+vSVtL2J0KLY=", "owner": "oxalica", "repo": "nil", - "rev": "5751bfe63a5cc8988a9cdebd14999b9e11bba401", + "rev": "510bc6e9b41d39c81b9c815065cb5b7e23a2428c", "type": "github" }, "original": { @@ -932,11 +972,11 @@ ] }, "locked": { - "lastModified": 1693753278, - "narHash": "sha256-sefqpUpADhd/lT6AjJkrUpH+cHlHNWHDIBLezEl8DaI=", + "lastModified": 1695826876, + "narHash": "sha256-EMYYQ27CBlWZxrrKsnREB29z25GNQUr3D9iv7wq5xqU=", "owner": "doronbehar", "repo": "nix-matlab", - "rev": "8eff87ed8e04b5e32f3720eac518f77023430f7d", + "rev": "c135fd375153999b06025ae2063acb555e86739f", "type": "gitlab" }, "original": { @@ -1023,11 +1063,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1686222921, - "narHash": "sha256-LUpAN3Q5Y32cabs4Fe1XEyjj973su21kSsJaFZnSQEw=", + "lastModified": 1689967002, + "narHash": "sha256-CYpbDmABaiRtH7MtIjBKAJ2H2MDqZU8Mur3Qkgj6J3w=", "owner": "nix-community", "repo": "NixNG", - "rev": "54978ce81634192f55d8607bead608a4fa463e13", + "rev": "3cba1cfa9cfd8051333d45a60cc180907461a2dd", "type": "github" }, "original": { @@ -1054,11 +1094,11 @@ }, "nixos-2305": { "locked": { - "lastModified": 1687938137, - "narHash": "sha256-Z00c0Pk3aE1aw9x44lVcqHmvx+oX7dxCXCvKcUuE150=", + "lastModified": 1694724971, + "narHash": "sha256-NazxO2WuzV1pVnVoFpo7vJbgTTDhywhDxEDwFw6tyWY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba2ded3227a2992f2040fad4ba6f218a701884a5", + "rev": "16a63df66bfefec64daab3da10d414055d782d66", "type": "github" }, "original": { @@ -1078,11 +1118,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1688907389, - "narHash": "sha256-oXxGC3yNvIkW+dXZUmvfLkWI6iCDbuUlh0OTmCOeYIA=", + "lastModified": 1695639255, + "narHash": "sha256-DOD0Iz6UqbNI/mq03YR/bvAfYOZeGYs2wVcaKxmdxoo=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "04f980980386c916ae12ef71d0960e6f2b50bd48", + "rev": "bb058eb8dc09eee376e0d8ff4abbbc29aa365022", "type": "github" }, "original": { @@ -1103,11 +1143,11 @@ ] }, "locked": { - "lastModified": 1686819168, - "narHash": "sha256-IbRVStbKoMC2fUX6TxNO82KgpVfI8LL4Cq0bTgdYhnY=", + "lastModified": 1694429687, + "narHash": "sha256-fopTSMmOjk7/ro8+P2wZxAC8OPUKtuwHLNp2xSPXVjc=", "owner": "nix-community", "repo": "nixos-images", - "rev": "ccc1a2c08ce2fc38bcece85d2a6e7bf17bac9e37", + "rev": "c4c73bce65306a1e747684dd0d4bcf0ab2779585", "type": "github" }, "original": { @@ -1118,11 +1158,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688465017, - "narHash": "sha256-xzFcCnzPOgQaX7Acprfqo+tqHJ2UKWC38pXrcqvdXHU=", + "lastModified": 1695806987, + "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d5682acc109add20f70440269587a1b169cc2fe", + "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", "type": "github" }, "original": { @@ -1182,11 +1222,11 @@ }, "nixpkgs-2205": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { @@ -1198,11 +1238,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -1214,11 +1254,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1685338297, - "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", "type": "github" }, "original": { @@ -1230,11 +1270,11 @@ }, "nixpkgs-hashicorp": { "locked": { - "lastModified": 1688918189, - "narHash": "sha256-f8ZlJ67LgEUDnN7ZsAyd1/Fyby1VdOXWg4XY/irSGrQ=", + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "408c0e8c15a1c9cf5c3226931b6f283c9867c484", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "type": "github" }, "original": { @@ -1247,11 +1287,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { @@ -1330,11 +1370,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1685347552, - "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { @@ -1346,11 +1386,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1688918189, - "narHash": "sha256-f8ZlJ67LgEUDnN7ZsAyd1/Fyby1VdOXWg4XY/irSGrQ=", + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "408c0e8c15a1c9cf5c3226931b6f283c9867c484", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "type": "github" }, "original": { @@ -1497,15 +1537,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1688679045, - "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", - "owner": "nixos", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c7487575d9445185249a159046cc02ff364bff8", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1529,11 +1569,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1688829822, - "narHash": "sha256-hv56yK1fPHPt7SU2DboxBtdSbIuv9nym7Dss7Cn2jic=", + "lastModified": 1690441914, + "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed6afb10dfdfc97b6bcf0703f1bad8118e9e961b", + "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", "type": "github" }, "original": { @@ -1577,11 +1617,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1687893427, - "narHash": "sha256-jJHj0Lxpvov1IPYQK441oLAKxxemHm16U9jf60bXAFU=", + "lastModified": 1694669921, + "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4b14ab2a916508442e685089672681dff46805be", + "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", "type": "github" }, "original": { @@ -1661,7 +1701,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "gitignore": "gitignore", "nixpkgs": [ "tuxedo-rs", @@ -1755,8 +1795,8 @@ "secret": { "flake": false, "locked": { - "lastModified": 1693687229, - "narHash": "sha256-E8TdhNfHj5A2iwA12snl/4eDzeZoe4ZN0UDn+fUWSuc=", + "lastModified": 1695889456, + "narHash": "sha256-5Vhl71S6vYnVr130B9Q6r1wy6424dxtqbGxSGLw0rnE=", "path": "/home/main/dotfiles2/secret", "type": "path" }, @@ -1769,7 +1809,7 @@ "inputs": { "deploy-rs": "deploy-rs", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "get-tested-src": "get-tested-src", "gitignore-nix": "gitignore-nix", "haskell-nix": [ @@ -1795,11 +1835,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1690416562, - "narHash": "sha256-8EWYStl70boiGC812A0bKyf1V3oY6gYi97oE/05IA4o=", + "lastModified": 1695859746, + "narHash": "sha256-i36APTMy5SOQ83uhriYH9z4p2t8SvC7JuyPwpGmXFqQ=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "736a930f1d8cc3d2b8a19ee54f046ca5a9923d66", + "rev": "291606f6b669a9441faf533acd43e0a34957749f", "type": "github" }, "original": { @@ -1877,11 +1917,11 @@ ] }, "locked": { - "lastModified": 1687940979, - "narHash": "sha256-D4ZFkgIG2s9Fyi78T3fVG9mqMD+/UnFDB62jS4gjZKY=", + "lastModified": 1694528738, + "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0a4f06c27610a99080b69433873885df82003aae", + "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", "type": "github" }, "original": { @@ -1898,11 +1938,11 @@ ] }, "locked": { - "lastModified": 1685384046, - "narHash": "sha256-FJNQ93vlzIc0+CKsRGEBA3wdElPP2G8VSFV8U2jyhJA=", + "lastModified": 1692543521, + "narHash": "sha256-/a6U3HkADtAZJq716PB4bxIw/7h5oEG6N7bvw8vTQtE=", "owner": "blitz", "repo": "tuxedo-nixos", - "rev": "3002821d13ff9b011a411f420d2aac36a394c433", + "rev": "91f7d9ba249f5fd1357f8d55bc510c1641d54a52", "type": "github" }, "original": { @@ -1913,18 +1953,18 @@ }, "tuxedo-rs": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1686236979, - "narHash": "sha256-9DAN4YSB+VrGQkZAhn93OdaE/rUIGysYTNHcSqvdA2k=", + "lastModified": 1695761463, + "narHash": "sha256-bk17vI1gLHayvCWfmZdCMqgmbJFOTDaaCaHcj9cLpMY=", "owner": "AaronErhardt", "repo": "tuxedo-rs", - "rev": "30209f9d4fb2792bff33c6b87b2a52444f15312c", + "rev": "a77a9f6c64e6dd1ede3511934392cbc16271ef6b", "type": "github" }, "original": { diff --git a/home-manager/modules/bash/bashrc b/home-manager/modules/bash/bashrc index 7034a94..bd843bc 100644 --- a/home-manager/modules/bash/bashrc +++ b/home-manager/modules/bash/bashrc @@ -16,10 +16,6 @@ ## Enable color on grep alias grep='grep --color=auto' -## Replace ls and cat with exa and bat respectively -alias ls='@exa@/bin/exa' -alias cat='@bat@/bin/bat' - if [ -z "${SHLVL_INIT+x}" ]; then export SHLVL_INIT=1 SHLVL=1 fi diff --git a/home-manager/modules/bash/default.nix b/home-manager/modules/bash/default.nix index fc5f104..cafed37 100644 --- a/home-manager/modules/bash/default.nix +++ b/home-manager/modules/bash/default.nix @@ -4,12 +4,5 @@ programs.direnv.nix-direnv.enable = true; home.file.".bash_profile".source = ./bash_profile; - home.file.".bashrc".source = pkgs.writeSubstitutedFile { - name = ".bashrc"; - file = ./bashrc; - substitutes = { - "exa" = "${pkgs.exa}"; - "bat" = "${pkgs.bat}"; - }; - }; + home.file.".bashrc".source = ./bashrc; } diff --git a/home-manager/modules/emacs/default.nix b/home-manager/modules/emacs/default.nix index 20bc6df..cfd6670 100644 --- a/home-manager/modules/emacs/default.nix +++ b/home-manager/modules/emacs/default.nix @@ -66,6 +66,7 @@ gnumake gcc mu + mu.mu4e ripgrep fd isync diff --git a/home-manager/modules/emacs/straight-versions.el b/home-manager/modules/emacs/straight-versions.el index 71b07d5..70b3320 100644 --- a/home-manager/modules/emacs/straight-versions.el +++ b/home-manager/modules/emacs/straight-versions.el @@ -1,104 +1,114 @@ (("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196") ("alert" . "c762380ff71c429faf47552a83605b2578656380") - ("all-the-icons.el" . "f75c1130b72c718bfaf18b56c445c4b58efc714f") + ("all-the-icons.el" . "be9d5dcda9c892e8ca1535e288620eec075eb0be") ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe") - ("cape" . "db3059af52718c7f55485ef183bdad3e40f58df9") + ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") + ("cape" . "f97e64e87071c880f4a92ac73bed667e89e4e580") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("clang-format" . "e48ff8ae18dc7ab6118c1f6752deb48cb1fc83ac") - ("compat" . "b3b18044f9ca99a53ade91794226d71968b3e14f") - ("consult" . "aadb912e126a143c60e6ece92b163a7356bd4730") - ("corfu" . "2e066448df9cc8b16e75f3bc22e6fb5a8d1c065d") - ("dash.el" . "96eaba028ac069ea0e5cc70de15b0229126a054a") - ("dirvish" . "4b63cd2e5ba994f8e674388db7035de1a8f0343f") + ("clang-format" . "bce0bb4ca17ecb6e6927074920945cef2a78f5b6") + ("compat" . "18696ce5b136c21069cd4a4723c9be6614cfc788") + ("consult" . "43380042daaaf57f60aa22962a97ed904a7d56ce") + ("corfu" . "4eb7b862dc3cdeb416c4f8774a2b68d9562d280d") + ("dap-mode" . "a31f2496605d076d50d49393116f77fbb29f2631") + ("dash.el" . "6db80c711ce947f6c6fa11e5c2257fff2c79d139") + ("dirvish" . "119f9f59a618bb7b476c93e9ab1d7542c5c1df41") ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c") - ("doom-modeline" . "3612082bc5cba712c07860ce37865f938beb9002") - ("el-get" . "22c83206bab10100fdee03cb2d5b97c8c24eff0e") + ("doom-modeline" . "4511397d3f50466819861a39cef9abdb357d1ee0") + ("el-get" . "05bb836e3dfac8ffe4b8a10ec332aa2f661523ce") ("el-secretario" . "93f9b1bd2e381354a6ae799fed3e4a8313f24e11") + ("eldoc" . "04bf5cd7dd85511a89b02bdb9658a9d4556d4c62") ("elisp" . "3497ffd763cadcc1f507aae88c3c7a84007ccfbd") - ("emacs-elixir" . "7641373f0563cab67cc5459c34534a8176b5e676") + ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a") ("emacs-hcl-mode" . "751b79247f326ab52e00032e805775c37ad9f080") ("emacs-libvterm" . "94e2b0b2b4a750e7907dacd5b4c0584900846dd1") - ("emacs-which-key" . "bd34ede7bf77ad3988330b37207f3978e7342c79") - ("emacsmirror-mirror" . "606c3dcfc57ee47a9969b4d9f3d87408f14ebffb") - ("emacsql" . "64012261f65fcdd7ea137d1973ef051af1dced42") - ("embark" . "10ac6b7260c82e3a59a33ea93e7027692b228e5f") - ("ement.el" . "5be1e0700288fea0762b4fc9311e0b05d6c78cc0") - ("envrc" . "15af96080772af415a56b680acdd7d2010a68ffa") + ("emacs-scad-mode" . "e1af74735ad6113448c99b3ab128a665e6adaaca") + ("emacs-scala-mode" . "5d7cf21c37e345c49f921fe5111a49fd54efd1e0") + ("emacs-which-key" . "4d20bc852545a2e602f59084a630f888542052b1") + ("emacsmirror-mirror" . "34892a5fd86a461dcb966a5852f2527a23141d7d") + ("emacsql" . "59de83a1276a5fbcf8a682b64bbdcf5e00c6ce8b") + ("embark" . "fcf068c0e912baa9267cbec02e56a5972d8f31b4") + ("ement.el" . "688a5ff3eac2d1d4741bdb37551d15b67f178492") + ("envrc" . "33d01388ce7ff14cb209015ce6f0d1a5bda6eb07") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") - ("f.el" . "af7d37c619010b576fd22b50c62c71ff33093f3c") - ("flycheck" . "5f2ef177cb21ae8b73714575802beef04abd0f5e") + ("f.el" . "ab3ee3811c53f9c2144ff45130361f3da242ffa2") + ("flycheck" . "e56e30d8c66ffc9776d07740658d3b542c1a8e21") ("flycheck-posframe" . "19896b922c76a0f460bf3fe8d8ebc2f9ac9028d8") - ("general.el" . "7ce8db297e3de258ec43802269438ac7f1918707") + ("general.el" . "833dea2c4a60e06fcd552b653dfc8960935c9fb4") ("gntp.el" . "767571135e2c0985944017dc59b0be79af222ef5") - ("gnu-elpa-mirror" . "eda4c968f0400750e17a013bb80832088dab12d1") - ("go-mode.el" . "166dfb1e090233c4609a50c2ec9f57f113c1da72") - ("haskell-mode" . "20d4e2300302a9af673e82d0185d3f489bfb0f59") + ("gnu-elpa-mirror" . "ebf10357d7e2e8d5d1ebca1ac7bfa225e05b1b4b") + ("go-mode.el" . "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") + ("haskell-mode" . "020707430d40a216e1c7deea34082eb3897ba943") ("hercules" . "557da39878d0637395fdded91243b340c37eff7b") - ("ht.el" . "3c1677f1bf2ded2ab07edffb7d17def5d2b5b6f6") + ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef") ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") - ("inheritenv" . "2102ed2d105a5c9f366cb6503d04794600985598") - ("js2-mode" . "7d928272bc311b1dd6f38d3f6365c18153e28636") - ("ledger-mode" . "7bed9b468bf7d2cd4dafa30b067bb576263f8e0c") - ("let-alist" . "021fc10df2e44faba4728d849ee767cf890aa51a") + ("indent-bars" . "2b0a4ad16804fb48821f661cd6be4652c0e37d72") + ("inheritenv" . "00106bb208d06e5f1ec25d0c2f41c000cbb25076") + ("js2-mode" . "79bc78d77db0d2e8e43dc0f9e0504ad90bcbc26d") + ("ledger-mode" . "105d67626e91acb4550ab860e0dc4247c8a4c79e") + ("let-alist" . "e3a340188a05be9e147056ff60d82e4eb614525b") ("log4e" . "737d275eac28dbdfb0b26d28e99da148bfce9d16") - ("lsp-haskell" . "3249cde75fb411f95fe173c222b848182fd0b752") - ("lsp-mode" . "cf30718ed5128753565452f476385dac1f7821d6") - ("lsp-origami" . "7df9c91a309aa4229bec41f109920b37c4197618") - ("lsp-pyright" . "54a2acddfdd7c3d31cb804a042305a3c6e60cf81") - ("lsp-python-ms" . "f8e7c4bcaefbc3fd96e1ca53d17589be0403b828") - ("lsp-ui" . "295d8984da06a745b0a36c56e28ce915bc389adb") - ("magit" . "6067f92c0195616707b25e23c2d4c0dd81928fd8") - ("map" . "a0e501aede34f183a8baa5d3d41610a3ffa1728e") - ("marginalia" . "3ddd2b7fa09e1e84112749ffbdcb6bd8900bfc26") - ("markdown-mode" . "5d98592fe516748034d8baf92d7c0ba045e1f87a") - ("melpa" . "86ca8d06599c8d7d9067ce92ae5dde3b122f6796") - ("meow" . "07ccf112fc1a56ddd96cfc39967957be7dc8dd5f") - ("mu4e-alert" . "3c9af8c7994df0a1a4f0703552ea3beffb485ace") - ("nongnu-elpa" . "0120f3dfe80cffe0c3016080d9205d12be3b741d") - ("openscad" . "31670fc8bbde97f47f050f1837de093ecee89e1e") - ("orderless" . "e6784026717a8a6a7dcd0bf31fd3414f148c542e") - ("org" . "080710797ad25e76c4556d2b03cc0aa5313cd187") - ("org-ql" . "2c098540cab6a0ee7d82abe2327d524a171edd1e") + ("lsp-docker" . "6b7701917417e4e74961185051c147e1bf003750") + ("lsp-haskell" . "b36b23eb45f858d87620cb03d8017c79408fd280") + ("lsp-metals" . "811f02e4416d208102350ea48404e0310ffea647") + ("lsp-mode" . "2f22487a6200b38fdb46100a02061f64eba0c3f4") + ("lsp-origami" . "86aa06517910141c3d5054eea5f7723461fce6a6") + ("lsp-pyright" . "cea14f6c9da899778ce1d8888af1508931bb7fb7") + ("lsp-python-ms" . "7bda327bec7b219d140c34dab4b1e1fbd41bc516") + ("lsp-treemacs" . "e66ae2196503d4e84334519e56b4388feffa5060") + ("lsp-ui" . "0dd39900c8ed8145d207985cb2f65cedd1ffb410") + ("magit" . "19b85820b0ac195ffe4cb54ed83032340cb01555") + ("map" . "a776553a0787e239126ca16a3e74424488c7cf4f") + ("marginalia" . "4e14bc0fa05ae8c35e019721d19acdec8b51248c") + ("markdown-mode" . "50e4452c95113df55953cfc310d7e18d8e6205de") + ("melpa" . "369b39722775636c528c8e1194df878f9e2cd03b") + ("meow" . "b47d1fa88fc3b06b9f70e4c8657a8f10f216a226") + ("mu4e-alert" . "6beda20fc69771f2778f507c4a9e069dbaf1b628") + ("nerd-icons.el" . "0262a8c4fa41541438e489572bba8f0b4b689ae7") + ("nongnu-elpa" . "7be7879e3ea01401ff51a515da882e79148392ea") + ("orderless" . "d6b402a89e234d0e6166247ed6025f9acc8b4d9a") + ("org" . "aa9177e1a8b039c357d369c1c9aaab710bb247a9") + ("org-ql" . "ca23b1c7bda7adbad994637de2ce8e862193e30d") ("org-roam" . "5c06471c3a11348342719fd9011486455adeb701") - ("org-super-agenda" . "f4f528985397c833c870967884b013cf91a1da4a") + ("org-super-agenda" . "4efc0bdfa3c9760256a651dc4d510658f41afe81") ("origami.el" . "e558710a975e8511b9386edc81cd6bdd0a5bda74") - ("ov" . "c5b9aa4e1b00d702eb2caedd61c69a22a5fa1fab") + ("ov" . "e2971ad986b6ac441e9849031d34c56c980cf40b") ("password-store" . "28cec11f1dbe6c4273d30370af45b69c9f408386") - ("pdf-tools" . "7ff6293a25baaae65651b3e1c54b61208279a7ef") - ("peg" . "5d4ed356ca89acdf52a3e7e7f8e2408b808552c4") - ("persist" . "c10835478d9f916534a07fad0174d497adf85729") + ("pdf-tools" . "c69e7656a4678fe25afbd29f3503dd19ee7f9896") + ("peg" . "ee4a6a766c5f19bb196e7b2487ffff3ca892eea3") + ("persist" . "92964dd24a13d2482a6ef7389da28b4ad7b4c6e3") ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c") ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") - ("plz" . "205e8284340ff10bc7a8468f8af0c50eb0e97c60") - ("popper" . "e3991202234e4dc10dbfae8e13b27c590dd52fb5") - ("posframe" . "3b97dc180b03498103cfcc7f44e64150df440bf0") - ("project" . "33511939473551b5cfa42de9a12d606b3d60a2cf") - ("projectile" . "271007c6611fcb08ddd326d7de9727c2ad5ef265") - ("racket-mode" . "c2fe266c18bb6e55a13c7ba795b0a5f7372b6c13") + ("plz" . "545ed3c5179dc2432ba25ea06a402a083c0f871b") + ("popper" . "570b0820f884a9c0e3d9cb07e7f7f523b39b836f") + ("posframe" . "017deece88360c7297265680d78a0bb316470716") + ("project" . "ce140cdb70138a4938c999d4606a52dbeced4676") + ("projectile" . "4247ac77173b6f92f28af04f5a72ff68de19f057") + ("racket-mode" . "b5162323d0ba590c368b1c67039bb3ee44cfcaaf") ("rjsx-mode" . "b697fe4d92cc84fa99a7bcb476f815935ea0d919") - ("rust-mode" . "e443ccf2884028d3b6cc550ff20e7c92dadccb68") + ("rust-mode" . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2") ("rustic" . "39423d1cf4fa054c36bf9577356451f4c06ee148") ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d") ("shackle" . "f1467db75a8fa5d51c676181fb308ccbf7b05e6f") ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41") - ("spinner" . "634529bb3173e09b37499f636de70abf29d9fa8a") - ("straight.el" . "039e5c9a9b5c00749602afb41341e9e77ba09429") - ("svg-lib" . "31085bbf247f0467e2f6af948085610248fce6c5") - ("tablist" . "faab7a035ef2258cc4ea2182f67e3aedab7e2af9") - ("taxy" . "b222226f9e1057490150c1a8a98e8b471df88302") - ("taxy-magit-section" . "00e1e41341cbc71fcc8f4d4c98b2cc5c371c4f54") - ("tempel" . "94afb9b916a711c56f23183da93a103338e9f84e") - ("terraform-mode" . "56f19abae95afb7e13e48ec3e6aeba3820d31307") - ("transient" . "af7fe42bd46e24ca7852e73bd1691015c5bd2151") - ("treemacs" . "983ea5a66801a5c1f6e32e3d515bd48761677ac6") + ("spinner" . "67681b8f1580a7cd7a1aa49d78eaa30d11f7c178") + ("straight.el" . "9b11112b2e7aedd994feb2d8f95bd66dbc5749a5") + ("svg-lib" . "3595d9f1f7127ffa47d772ba0e727ecbb18bb8bd") + ("tablist" . "5f7b71a92bfb25418d7da86ad9c45f14b149496f") + ("taxy" . "43a5f3139a33a574882a97ccab58dffa4b8dbf2a") + ("taxy-magit-section" . "7e4ba4ecd0464ee45e7e16dae0272e6f790a40e6") + ("tempel" . "023001cece278a8ab4a6904c05a1ee68c570efe9") + ("terraform-mode" . "25a22a66f81e35c75f2fdaaab89aad7f9940fe06") + ("transient" . "04f87b4ab3c7448a78f452cadaaf5d9e7a216d1d") + ("treemacs" . "d94bbdacea7558a6624093b18359da387975810c") ("ts.el" . "552936017cfdec89f7fc20c254ae6b37c3f22c5b") ("typescript.el" . "4fcb4594819caf472ae42ea068a1c7795cf07f46") ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c") - ("vertico" . "dd8eb3aa3d0d048cc0e1bc455f42a12a4162f5bb") - ("vulpea" . "f4d3448b6ccdb314c5fe3defea66e750e1371a10") - ("web-mode" . "57856ba64b9382811b35df0d9ab0a24aede0c1f0") - ("with-editor" . "df74385b455cd7687232ad189acfea16cb44dd04") - ("xref" . "420511e20187d0c6c8680c0e63ae8810f84dee00") + ("vertico" . "f0e22ff5a18987cd6f566a850b5f52fa06807b51") + ("vulpea" . "1b8445a0838c34c8e79cdd9ee3694bae55e421aa") + ("web-mode" . "44c6bfa3626f476750ed3c1c0d253607c1606716") + ("with-editor" . "fcd186d1e684c2dca6497c89af77b27b2b036c11") + ("xref" . "5d708092fd70864ae898628b0ba2aa850886566f") ("xterm-color" . "2ad407c651e90fff2ea85d17bf074cee2c022912") - ("yaml-mode" . "b153150e0e77b4ec462d741cdb16956c6ae270d6")) + ("yaml-mode" . "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91") + ("yaml.el" . "fe08b8f5307af1e7b876ece64b7303213f04b63c")) :gamma diff --git a/home-manager/modules/profiles/workstation.nix b/home-manager/modules/profiles/workstation.nix index f7f94f4..2bcf540 100644 --- a/home-manager/modules/profiles/workstation.nix +++ b/home-manager/modules/profiles/workstation.nix @@ -65,13 +65,6 @@ in jdk11 jdk17 ]; - prismlauncher-unwrapped = - (prismlauncher-unwrapped.overrideAttrs (old: { - patches = singleton (pkgs.fetchurl { - url = "https://github.com/PrismLauncher/PrismLauncher/commit/603b38fa46dc61c0c5ae10a3754bcacb0201d881.diff"; - sha256 = "sha256-Q/WkDVIvlYu6lkRPjoYZOUif0TPUT6Mmxd1JR4pgdLI="; - }); - })); }) dejavu_fonts diff --git a/nixos/modules/notnft.nix b/nixos/modules/notnft.nix index 9eb68e1..1eb04e8 100644 --- a/nixos/modules/notnft.nix +++ b/nixos/modules/notnft.nix @@ -81,7 +81,7 @@ in boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; - networking.networkmanager.firewallBackend = mkDefault "nftables"; + # networking.networkmanager.firewallBackend = mkDefault "nftables"; systemd.services.notnftables = { description = "notnftables firewall"; before = [ "network-pre.target" ]; diff --git a/nixos/systems/omen/default.nix b/nixos/systems/omen/default.nix index fc39cfe..4c45d81 100644 --- a/nixos/systems/omen/default.nix +++ b/nixos/systems/omen/default.nix @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2022 Richard Brežák # # SPDX-License-Identifier: LGPL-3.0-or-later -{ inputs, lib', config, secret, ... }: +{ inputs, lib', config, ... }: let inherit (lib') flip @@ -24,7 +24,7 @@ in }; modules = singleton - ({ pkgs, lib, config, ... }: + ({ pkgs, lib, config, secret, ... }: { imports = [ ./xserver.nix @@ -105,15 +105,12 @@ in shift 1 done - exec ${lib.getExe virtiofsd} "''${ok_args[@]}" + exec ${lib.getExe' "virtiofsd" virtiofsd} "''${ok_args[@]}" ''; } ) ]; - # networking.nftables = { - # enable = true; - # rulesetFile = networking.notnft.rules = let notnft = (inputs.notnft.lib.${pkgs.stdenv.system}); @@ -183,7 +180,7 @@ in output-wg0 = add chain # TCP, UDP 53 to blowhole - [ (is.eq ip.protocol (f: with f; set [ udp tcp ])) (is.eq th.dport 53) (is.eq ip.saddr (secret.network.ips.omen.vpn or "")) (is.eq ip.daddr (secret.network.ips.blowhole.ip or "")) accep t] + [ (is.eq ip.protocol (f: with f; set [ udp tcp ])) (is.eq th.dport 53) (is.eq ip.saddr (secret.network.ips.omen.vpn or "")) (is.eq ip.daddr (secret.network.ips.blowhole.ip or "")) accept ] # TCP 22, 80, 4646, 8200, 8500, 2049 to blowhole [ (is.eq ip.protocol (f: with f; set [ tcp ])) (is.eq th.dport (set [ 22 80 4646 8200 8500 2049 ])) (is.eq ip.saddr (secret.network.ips.omen.vpn or "")) (is.eq ip.daddr (secret.network.ips.blowhole.ip or "")) accept ] diff --git a/nixos/systems/omen/hardware.nix b/nixos/systems/omen/hardware.nix index acb1551..c1ed32c 100644 --- a/nixos/systems/omen/hardware.nix +++ b/nixos/systems/omen/hardware.nix @@ -7,7 +7,7 @@ let singleton mkForce; - kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; + kernelPackages = pkgs.zfsUnstable.latestCompatibleLinuxPackages; in { environment.systemPackages = [ diff --git a/nixos/systems/omen/networking.nix b/nixos/systems/omen/networking.nix index 2087d2f..b094000 100644 --- a/nixos/systems/omen/networking.nix +++ b/nixos/systems/omen/networking.nix @@ -36,7 +36,7 @@ in case $IFACE in eth0) - echo $IP_ADDRS | ${lib.getExe pkgs.grepcidr} ${secret.network.networks.home.amsterdam} > /dev/null + echo $IP_ADDRS | ${lib.getExe' "grepcidr" pkgs.grepcidr} ${secret.network.networks.home.amsterdam} > /dev/null home_net=$? case $STATE in diff --git a/overlays/emacs-master-nativecomp/default.nix b/overlays/emacs-master-nativecomp/default.nix index 39a76c0..bff489d 100644 --- a/overlays/emacs-master-nativecomp/default.nix +++ b/overlays/emacs-master-nativecomp/default.nix @@ -31,6 +31,8 @@ GSS = null; ImageIO = null; sigtool = null; + Accelerate = null; + UniformTypeIdentifiers = null; }; in emacs-master-package.override { diff --git a/overlays/magic-screenshot/default.nix b/overlays/magic-screenshot/default.nix index d42924d..7f72551 100644 --- a/overlays/magic-screenshot/default.nix +++ b/overlays/magic-screenshot/default.nix @@ -2,12 +2,12 @@ { flake.overlays.magic-screenshot = final: prev: { - magic-screenshot = final.writeSubstitutedShellScriptBin { + magic-screenshot = (final.writeSubstitutedShellScriptBin { name = "screenshot"; file = ./screenshot; substitutes = with prev; { inherit busybox scrot xclip; }; - }; + }) // { meta.mainProgram = "screenshot"; }; }; }