diff --git a/flake.lock b/flake.lock index 6fd084f3..b32681d5 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1650221581, - "narHash": "sha256-G1+amkwjxMCVC7v0wLiK1eLEPsCVVyMWWoINOWpX4LY=", + "lastModified": 1650740323, + "narHash": "sha256-f6cx542n4or6BE5fWyCCvXgmACzogqi9m7vvxrfi170=", "owner": "accentor", "repo": "flake", - "rev": "066257d629bc54dc296f9487a89516e3d4dbb70c", + "rev": "0d9c96d79d3b685943c5b05fda6f9661321e52b6", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1650709546, - "narHash": "sha256-3RGDsUVqXQxOTPcWor9Hc8xT6qiZMKdfVrQrz9cLxqA=", + "lastModified": 1650772401, + "narHash": "sha256-1pRrL9nqmWxV0MUKYB0ZxI7ksR9Vu/VT3wldEiwHKZo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e103bfabd3e1adbfc4e5aab8d12b8fe70d78885", + "rev": "6216f7c7e05c5f7d579dc898219207a8509be910", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650161686, - "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", + "lastModified": 1650701402, + "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887", + "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nur": { "locked": { - "lastModified": 1650712914, - "narHash": "sha256-+33AFZ0hlU9OLSJVlKgpYj9+CJqTjJ3f8WidBnQ7Wj4=", + "lastModified": 1650775191, + "narHash": "sha256-m92XdImMuRWzOxN1ZTXqFv7eiHkL+tEjvoswJMqW2U0=", "owner": "nix-community", "repo": "NUR", - "rev": "f0c47c63e6773688228fd38630b93c8effd9bd33", + "rev": "2a211052daea8400fe7f92f5057122ec2eecac61", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1650613779, - "narHash": "sha256-UhiUlpfUipakSJDPQB6HWNBZ86bdxMBMt9RpUJZeJHE=", + "lastModified": 1650739424, + "narHash": "sha256-n/0vg30Tt+6ouVj7VwB7jgEMTxnMzE1SiQYDt6FL7zo=", "owner": "chvp", "repo": "tetris", - "rev": "0223057efaf91c66083dbdfb231d1565a0a3ed67", + "rev": "de74d17f60c7a173c865f0e2462a4c8e43becad5", "type": "github" }, "original": { diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix index 2d9f8768..d789dcf6 100644 --- a/machines/lasting-integrity/default.nix +++ b/machines/lasting-integrity/default.nix @@ -103,5 +103,5 @@ syncthing.enable = true; }; }; - services.ssmtp.enable = false; + programs.msmtp.enable = false; } diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix index b0ccdda3..f0e889a4 100644 --- a/modules/base/emacs/default.nix +++ b/modules/base/emacs/default.nix @@ -16,7 +16,7 @@ readOnly = true; default = pkgs.emacsWithPackagesFromUsePackage { config = config.chvp.base.emacs.fullConfig; - package = pkgs.emacsPgtkGcc; + package = pkgs.emacsPgtkNativeComp; alwaysEnsure = true; # mu4e is included in the mu package and should be used from there extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu; diff --git a/modules/base/mail/default.nix b/modules/base/mail/default.nix index 65b8ce79..afd56793 100644 --- a/modules/base/mail/default.nix +++ b/modules/base/mail/default.nix @@ -1,15 +1,20 @@ { config, lib, pkgs, ... }: { - services.ssmtp = { + programs.msmtp = { enable = lib.mkDefault true; - authUser = "webmaster@vanpetegem.me"; - authPassFile = config.age.secrets."passwords/services/ssmtp-pass".path; - domain = "${config.networking.hostName}.vanpetegem.me"; - hostName = "mail.vanpetegem.me:465"; - root = "webmaster@vanpetegem.me"; + accounts.default = { + auth = true; + from = "webmaster@vanpetegem.me"; + host = "mail.vanpetegem.me"; + passwordeval = ''cat ${config.age.secrets."passwords/services/ssmtp-pass".path}''; + port = 465; + tls = true; + tls_starttls = false; + tls_trust_file = "${pkgs.cacert}/etc/ssl/certs/ca-certificates.crt"; + user = "webmaster@vanpetegem.me"; + }; setSendmail = true; - useTLS = true; }; age.secrets."passwords/services/ssmtp-pass".file = ../../../secrets/passwords/services/ssmtp-pass.age; diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index 663a95b6..3fd6b841 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -52,6 +52,6 @@ end group :development do gem 'annotate', '~> 3.2' # Remove workaround in lib/tasks/annotate.rb when https://github.com/ctran/annotate_models/issues/696 is fixed - gem 'rubocop-minitest', '~> 0.19.0' + gem 'rubocop-minitest', '~> 0.19.1' gem 'rubocop-rails', '~> 2.14' end diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index fd589c22..cc27d6b6 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -154,7 +154,7 @@ GEM mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.22.1) - parser (3.1.1.0) + parser (3.1.2.0) ast (~> 2.4.1) pg (1.3.5) puma (5.6.4) @@ -207,9 +207,9 @@ GEM rubocop-ast (>= 1.16.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) - rubocop-minitest (0.19.0) + rubocop-minitest (0.19.1) rubocop (>= 0.90, < 2.0) rubocop-rails (2.14.2) activesupport (>= 4.2.0) @@ -259,7 +259,7 @@ DEPENDENCIES pundit (~> 2.2) rack-cors (~> 1.1) rails (~> 7.0) - rubocop-minitest (~> 0.19.0) + rubocop-minitest (~> 0.19.1) rubocop-rails (~> 2.14) simplecov (~> 0.21) tzinfo-data diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 8fe68825..a4b3656f 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -35,7 +35,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "sng5nb4enaOx2Kif0PbvWMKc6/8is0xuTnqi/LQq+yo="; + sha256 = "sBmcgvGYeqcXKaYaIrpBU3jitTk8YXlnEk4GEGjfup0="; }; }); webPackage = (pkgs.accentor-web.override { @@ -48,7 +48,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "dbTYLhCrJLKy5o/G1udqd+3iQcTjMwSfNgaiwfRes1U="; + sha256 = "SDSpikTeMWYjkC2NmBxakbG+Evtv22vFYw8dKGSHsOg="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index 561dc110..ed2a1041 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -621,10 +621,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.1.1.0"; + version = "3.1.2.0"; }; pg = { groups = [ "default" ]; @@ -811,10 +811,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubocop-minitest = { dependencies = [ "rubocop" ]; @@ -822,10 +822,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07nzbfrhwf1ldb5f8nm64xpf0vk2wq3k7kn6s12qyrkjw9d252pj"; + sha256 = "1v95yrl0plni1mf2p3hz7ka382z7nancbvb75lrfv69b7ridx8mk"; type = "gem"; }; - version = "0.19.0"; + version = "0.19.1"; }; rubocop-rails = { dependencies = [ "activesupport" "rack" "rubocop" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 82693e07..b6935a78 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -13,7 +13,7 @@ "@mdi/font": "^6.6.96", "@mdi/svg": "^6.6.96", "fetch-retry": "^5.0.2", - "gsap": "^3.10.2", + "gsap": "^3.10.3", "localforage": "^1.10.0", "lodash.debounce": "^4.0.8", "roboto-fontface": "^0.10.0", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index d416a229..89b85268 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -1895,9 +1895,9 @@ array-union@^2.1.0: integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" @@ -3500,10 +3500,10 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== -gsap@^3.10.2: - version "3.10.2" - resolved "https://registry.yarnpkg.com/gsap/-/gsap-3.10.2.tgz#a3b0a842c398099fc7a80313bfb42253a3dc2b6b" - integrity sha512-exJVOda3O1NpgGjM4dzZONmSODWFP+JF/DwfiBfCPQPr15nm3M0TQczYKLZlMdBNdWxHMvRPKVqc1e1/6YD+zA== +gsap@^3.10.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/gsap/-/gsap-3.10.3.tgz#368f03123ae4f9e48fe9c8912a6a92ba31c56194" + integrity sha512-O4P5mC6awoo0uSemZ1kS1Nm52I4/3gC8gy6ws6VFXvR1KmA4oRlBY/ZI4+LWsH0MoSDZrpwNyF9FAkB37UTGVg== gzip-size@^6.0.0: version "6.0.0" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index 5c80983d..b61be340 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -1834,11 +1834,11 @@ }; } { - name = "async___async_2.6.3.tgz"; + name = "async___async_2.6.4.tgz"; path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + name = "async___async_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; } { @@ -3586,11 +3586,11 @@ }; } { - name = "gsap___gsap_3.10.2.tgz"; + name = "gsap___gsap_3.10.3.tgz"; path = fetchurl { - name = "gsap___gsap_3.10.2.tgz"; - url = "https://registry.yarnpkg.com/gsap/-/gsap-3.10.2.tgz"; - sha512 = "exJVOda3O1NpgGjM4dzZONmSODWFP+JF/DwfiBfCPQPr15nm3M0TQczYKLZlMdBNdWxHMvRPKVqc1e1/6YD+zA=="; + name = "gsap___gsap_3.10.3.tgz"; + url = "https://registry.yarnpkg.com/gsap/-/gsap-3.10.3.tgz"; + sha512 = "O4P5mC6awoo0uSemZ1kS1Nm52I4/3gC8gy6ws6VFXvR1KmA4oRlBY/ZI4+LWsH0MoSDZrpwNyF9FAkB37UTGVg=="; }; } {