From a81377f547d3bf54e7badd76a98bfaa8123a6689 Mon Sep 17 00:00:00 2001 From: willemml Date: Sun, 18 Jun 2023 12:36:54 -0700 Subject: [PATCH] remove feeds --- flake.lock | 123 ++++++++++-------- .../profiles/user/willem/darwin/launchd.nix | 13 -- .../modules/profiles/user/willem/feeds.nix | 50 ------- .../modules/profiles/user/willem/packages.nix | 2 + .../profiles/user/willem/programs/default.nix | 2 +- .../user/willem/programs/emacs/default.nix | 10 +- .../user/willem/programs/emacs/init.el | 14 +- .../profiles/user/willem/programs/firefox.nix | 3 +- .../profiles/user/willem/programs/zsh.nix | 2 +- 9 files changed, 98 insertions(+), 121 deletions(-) delete mode 100644 home-manager/modules/profiles/user/willem/feeds.nix diff --git a/flake.lock b/flake.lock index f2c14fe..f4436cc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1681154394, - "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", + "lastModified": 1685559570, + "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", + "rev": "4338bc869e9874d54a4c89539af72f16666b2abe", "type": "github" }, "original": { @@ -25,14 +25,15 @@ "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681165126, - "narHash": "sha256-Qte3CafN9PkT+hx6HBKqQoCeQAdOGi5ZEUByKQh1IX0=", + "lastModified": 1685787331, + "narHash": "sha256-th38r/V0uUDeflZ8cfiXX5rv/ioZhicBW9M0y8r4KMU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "644ae3ce05ae9d42232bba9642d4eaa63bb062d3", + "rev": "fbbf354bceb8d42d1e0eef8116b66e9947c84017", "type": "github" }, "original": { @@ -47,11 +48,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1681107727, - "narHash": "sha256-49r7llR0lRrZLC2uBiRgXN0Ds1kfH7JgBfH5+sQAGio=", + "lastModified": 1685773231, + "narHash": "sha256-UXX8dNzmZFqQhvHKPoarLxgTUll+knUHLW1W71gwnEQ=", "owner": "nix-community", "repo": "fenix", - "rev": "4869bb2408e6778840c8d00be4b45d8353f24723", + "rev": "09380d8560af38fffc04d95951b981f5b754ff48", "type": "github" }, "original": { @@ -81,11 +82,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "type": "github" }, "original": { @@ -95,12 +96,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -164,15 +168,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681162249, - "narHash": "sha256-jh5fLaTxR5XowXA0CN/1Gs2qbvVdmdPCSeO424XWZLI=", + "lastModified": 1685721552, + "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e79c6a414ce59fd1a53ab77899c77ab87774e6b", + "rev": "29519461834c08395b35f840811faf8c23e3b61c", "type": "github" }, "original": { @@ -189,11 +192,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1679451428, - "narHash": "sha256-Xk3WBlejWUpnuOnMZzTH7mV/bTRxKIrln871ba3uQjI=", + "lastModified": 1683434835, + "narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "696d7b4ac7ca05684a3cceedd44acfd0d1c5f1e3", + "rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58", "type": "github" }, "original": { @@ -204,11 +207,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -221,11 +224,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1685564631, + "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", "type": "github" }, "original": { @@ -237,6 +240,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1685650716, + "narHash": "sha256-sDd7QIcMbIb37nuqMrJElvuyE5eVgWuKGtIPP8IWwCc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f7c1500e2eefa58f3c80dd046cba256e10440201", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -254,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681036984, - "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -292,14 +311,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1680981441, - "narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=", + "lastModified": 1685361114, + "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2144d9ddcb550d6dce64a2b44facdc8c5ea2e28a", + "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4", "type": "github" }, "original": { @@ -324,11 +343,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1680884353, - "narHash": "sha256-efcZC+/FH3ZXMgDL3K5RIzKeD0Ow1ci096cXkTsP8SQ=", + "lastModified": 1685736988, + "narHash": "sha256-2Z9Auifh8bTp4gw+rySAUSVq0B0cEKJyoV3Znb8wfcQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "01120f1213ad928de7300a8acf9f41bed72d0422", + "rev": "7f3bfc6ae75a47e1fd8d79b4dde79956cdd98093", "type": "github" }, "original": { @@ -361,11 +380,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1676584149, - "narHash": "sha256-3gWGqaVDx4N0Xkb5xFotVoKsqDTo4Jes3b6VSxP/UDw=", + "lastModified": 1685782576, + "narHash": "sha256-1y68FRGC8nM6/068OewrAsz86SUjLg+kHUw0OmsN1Mo=", "ref": "refs/heads/master", - "rev": "db2f2ff538c8c755e6b062c9be1c514752c6ee1a", - "revCount": 2706, + "rev": "1f021c34953ecfd8b916df9427a69973b465c1dc", + "revCount": 2897, "type": "git", "url": "https://git.sr.ht/~rycee/nur-expressions?dir=pkgs%2ffirefox-addons" }, @@ -375,18 +394,18 @@ "url": "https://git.sr.ht/~rycee/nur-expressions?dir=pkgs%2ffirefox-addons" } }, - "utils": { + "systems": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "nix-systems", + "repo": "default", "type": "github" } } diff --git a/home-manager/modules/profiles/user/willem/darwin/launchd.nix b/home-manager/modules/profiles/user/willem/darwin/launchd.nix index 1e4cb0f..fbdbaf3 100644 --- a/home-manager/modules/profiles/user/willem/darwin/launchd.nix +++ b/home-manager/modules/profiles/user/willem/darwin/launchd.nix @@ -55,18 +55,5 @@ in { StandardErrorPath = logFile "offlineimap"; }; }; - - agents.rss2email = { - enable = true; - config = { - ProgramArguments = [ - "${pkgs.rss2email}/bin/r2e" - "run" - ]; - StartInterval = 3600; - StandardOutPath = logFile "rss2email"; - StandardErrorPath = logFile "rss2email"; - }; - }; }; } diff --git a/home-manager/modules/profiles/user/willem/feeds.nix b/home-manager/modules/profiles/user/willem/feeds.nix deleted file mode 100644 index 9fa3ed0..0000000 --- a/home-manager/modules/profiles/user/willem/feeds.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - feeds = { - calvinandhobbes = "https://www.comicsrss.com/rss/calvinandhobbes.rss"; - dailywtf = "http://syndication.thedailywtf.com/TheDailyWtf"; - devto = "https://dev.to/feed/"; - insiderust = "https://blog.rust-lang.org/inside-rust/feed.xml"; - kdb424 = "https://blog.kdb424.xyz/atom.xml"; - logrocket = "https://blog.logrocket.com/feed/"; - nixos = "https://weekly.nixos.org/feeds/all.rss.xml"; - rust = "https://blog.rust-lang.org/feed.xml"; - sourcehut = "https://sourcehut.org/blog/index.xml"; - xkcd = "http://xkcd.com/atom.xml"; - }; - - rss2emailConfig = { - active = "true"; - date-header = "True"; - email-protocol = "maildir"; - force-from = "False"; - from = "rss2email@home.localhost"; - html-mail = "True"; - maildir-mailbox = "feeds"; - maildir-path = config.home.sessionVariables.MAILDIR; - to = "willem@home.localhost"; - use-publisher-email = "True"; - }; - - mkFeedString = name: url: '' - - [feed.${name}] - url = ${url} - ''; - - configStrings = lib.mapAttrsToList (name: value: "${name} = ${value}\n") rss2emailConfig; - - feedStrings = lib.mapAttrsToList mkFeedString feeds; - - configArray = ["[DEFAULT]\n"] ++ configStrings ++ feedStrings; - - configString = lib.concatStrings configArray; -in { - home.packages = [pkgs.rss2email]; - - home.file.".config/rss2email.cfg".text = configString; -} diff --git a/home-manager/modules/profiles/user/willem/packages.nix b/home-manager/modules/profiles/user/willem/packages.nix index f645631..5cd1ff1 100644 --- a/home-manager/modules/profiles/user/willem/packages.nix +++ b/home-manager/modules/profiles/user/willem/packages.nix @@ -104,6 +104,7 @@ in { nodejs octave-wp openssh + pass-git-helper pinentry plantuml poppler @@ -127,6 +128,7 @@ in { unzip vkquake wget + xquartz yq zsh-completions ] diff --git a/home-manager/modules/profiles/user/willem/programs/default.nix b/home-manager/modules/profiles/user/willem/programs/default.nix index b3b7aff..7215e73 100644 --- a/home-manager/modules/profiles/user/willem/programs/default.nix +++ b/home-manager/modules/profiles/user/willem/programs/default.nix @@ -54,7 +54,7 @@ push.autoSetupRemote = true; }; lfs.enable = true; - package = pkgs.gitAndTools.gitFull; + package = pkgs.gitFull; userName = "willemml"; userEmail = "willem@leit.so"; }; diff --git a/home-manager/modules/profiles/user/willem/programs/emacs/default.nix b/home-manager/modules/profiles/user/willem/programs/emacs/default.nix index 302b8b4..8da45d7 100644 --- a/home-manager/modules/profiles/user/willem/programs/emacs/default.nix +++ b/home-manager/modules/profiles/user/willem/programs/emacs/default.nix @@ -5,7 +5,7 @@ }: let aspellPackage = pkgs.aspellWithDicts (d: [d.en d.en-science d.en-computers d.fr]); emacsPackage = - (pkgs.emacsPackagesFor pkgs.emacsGit).emacsWithPackages + (pkgs.emacsPackagesFor pkgs.emacs-git).emacsWithPackages (epkgs: (with epkgs; let company-mode = epkgs.trivialBuild { @@ -73,6 +73,14 @@ sha256 = "sha256-cMAhwybnq5HA1wOaUqDPML3nnh5m1iwEETTPWqPbAvw="; }; }; + rustic = epkgs.rustic.overrideAttrs (old: { + patches = [ + (builtins.fetchurl { + url = "https://github.com/yuuyins/rustic/commit/12a3a962ff4aad605bfdfcc2ded99878b2d7de6e.patch"; + sha256 = "sha256-x4JI0zwjj/3jP4ArVt6WTXfuNdbZX8ah9ZEcRiOKW5U="; + }) + ]; + }); in [ all-the-icons all-the-icons-dired diff --git a/home-manager/modules/profiles/user/willem/programs/emacs/init.el b/home-manager/modules/profiles/user/willem/programs/emacs/init.el index 36c84ff..d54f5bf 100644 --- a/home-manager/modules/profiles/user/willem/programs/emacs/init.el +++ b/home-manager/modules/profiles/user/willem/programs/emacs/init.el @@ -102,6 +102,7 @@ (require 'plantuml-mode) (require 'polymode) (require 'rustic) +(require 'rust-ts-mode) (require 'smtpmail-async) (require 'swiper) (require 'tex) @@ -311,6 +312,9 @@ (add-hook 'mu4e-compose-pre-hook 'my-mu4e-set-account) +(setq browse-url-browser-function 'browse-url-generic) +(setq browse-url-generic-program "firefox") + (define-hostmode poly-nix-hostmode :mode 'nix-mode) (define-auto-innermode poly-any-expr-nix-innermode @@ -468,9 +472,17 @@ Opens in new window otherwise opens in current window." (setq plantuml-default-exec-mode 'executable) -(define-key rustic-mode-map (kbd "C-c C-y") 'eglot-format-buffer) +(define-key eglot-mode-map (kbd "C-c C-y") 'eglot-format-buffer) +(define-key eglot-mode-map (kbd "C-c C-a") 'eglot-code-actions) +(setq eglot-extend-to-xref t) (setq rustic-lsp-client 'eglot) +(setq rustic-treesitter-derive t) + +(setq auto-mode-alist (rassq-delete-all 'rust-mode auto-mode-alist)) +(setq auto-mode-alist (rassq-delete-all 'rust-ts-mode auto-mode-alist)) +(add-to-list 'auto-mode-alist '("\\.rs\\'" . rustic-mode)) + (defvar separedit-preserve-string-indentation t) (global-set-key (kbd "C-c '") 'separedit) (add-hook 'separedit-buffer-creation-hook 'normal-mode) diff --git a/home-manager/modules/profiles/user/willem/programs/firefox.nix b/home-manager/modules/profiles/user/willem/programs/firefox.nix index 9eb8f91..7ccbc9a 100644 --- a/home-manager/modules/profiles/user/willem/programs/firefox.nix +++ b/home-manager/modules/profiles/user/willem/programs/firefox.nix @@ -18,7 +18,6 @@ '' { "policies": { - "DisableAppUpdate": true, "DisableFirefoxAccounts": true, "DisableFirefoxStudies": true, "DisableTelemetry": true, @@ -93,7 +92,7 @@ }; }; settings = { - "app.update.auto" = false; + "app.update.auto" = true; "app.update.checkInstallTime" = false; "app.update.silent" = true; "browser.aboutConfig.showWarning" = false; diff --git a/home-manager/modules/profiles/user/willem/programs/zsh.nix b/home-manager/modules/profiles/user/willem/programs/zsh.nix index 86c72d2..1d8a700 100644 --- a/home-manager/modules/profiles/user/willem/programs/zsh.nix +++ b/home-manager/modules/profiles/user/willem/programs/zsh.nix @@ -81,7 +81,7 @@ em = "emacs -nw"; email = "${ew} -n --eval '(mu4e)'"; emw = "emacs"; - ew = "emacsclient -c"; + ew = "emacsclient -c -n"; getmail = "${pkgs.offlineimap}/bin/offlineimap -f INBOX"; l = "ls -1"; np = "nix-shell -p";