From 23b341a314df5a3e76504c9703b931a65f34a4f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 8 May 2022 00:50:36 +0000 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/d14adb99f3fb562ec74ad18c032efc154b438034' (2022-04-26) → 'github:nix-community/home-manager/d93d56ab8c1c6aa575854a79b9d2f69d491db7d0' (2022-05-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/feea25c58657fa81d16e0e51f80e1a02ef4cbd49' (2022-04-27) → 'github:NixOS/nixpkgs/5656d7f92aa8264eb06ba68ad94c87ac5b5312e8' (2022-05-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/05ced71757730406ca3eb3e58503f05334a6057d' (2022-05-01) → 'github:NixOS/nixpkgs/d707e510df39cdd8fe1d3e244371a3a9f23051d2' (2022-05-08) • Updated input 'retiolum': 'github:krebs/retiolum/de6d7dc9bd671e65f2ee3004b6807625e7553e84' (2022-03-16) → 'github:krebs/retiolum/2bafba9621b83529b78fb2db34b351fd19411c0e' (2022-05-04) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=92d5eacd6d9e530c4d1ea0dec2652417b0fde78a' (2022-04-15) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=376b92c877442ec3be476ea5f4c89f8a715426dd' (2022-05-04) --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 488865c..ab12039 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1651007218, - "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=", + "lastModified": 1651519540, + "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", "owner": "nix-community", "repo": "home-manager", - "rev": "d14adb99f3fb562ec74ad18c032efc154b438034", + "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651093906, - "narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=", + "lastModified": 1651848520, + "narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49", + "rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1651365995, - "narHash": "sha256-fHKY8+nfPuVMDjSih8j/xoaTLpngW6b4QxJbICBLQmc=", + "lastModified": 1651970800, + "narHash": "sha256-6mDxz6fD7fgBC1TY5OMcU/Qubf+OlAyeVR8YCoNKD2A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "05ced71757730406ca3eb3e58503f05334a6057d", + "rev": "d707e510df39cdd8fe1d3e244371a3a9f23051d2", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "retiolum": { "flake": false, "locked": { - "lastModified": 1647444524, - "narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=", + "lastModified": 1651665107, + "narHash": "sha256-/fKmwakb9E8ctILu5RNUrjzq7gls0tqn8Oup3Y1xmzY=", "owner": "krebs", "repo": "retiolum", - "rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84", + "rev": "2bafba9621b83529b78fb2db34b351fd19411c0e", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "stockholm": { "flake": false, "locked": { - "lastModified": 1650040948, - "narHash": "sha256-/4Q2vnl53BQVYQFSZqF512CF6tzIyPHaDy4Yheof8G4=", + "lastModified": 1651664500, + "narHash": "sha256-KYGx877YzpWQWk++YqnUQK4pu8JYJnSdMSUU9r2/xGU=", "ref": "master", - "rev": "92d5eacd6d9e530c4d1ea0dec2652417b0fde78a", - "revCount": 10516, + "rev": "376b92c877442ec3be476ea5f4c89f8a715426dd", + "revCount": 10527, "type": "git", "url": "https://cgit.lassul.us/stockholm" }, From dcbe8841ba456e3b01da3409ce6dad5bbe36920c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 8 May 2022 09:14:20 +0200 Subject: [PATCH 2/4] feat(scripts): back to old ipa script --- packages/scripts/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index e485086..f6ac75e 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -307,16 +307,11 @@ in packages = [pkgs.xdo]; }; - ipa = - pkgs.writers.writeHaskellBin "ipa" { - libraries = with pkgs; [haskellPackages.text haskellPackages.ipa]; - } '' - import Data.Maybe (fromJust) - import Language.IPA - import qualified Data.Text as T - import qualified Data.Text.IO as T - main = T.interact (T.unwords . map (unIPA . fromJust . (xSampaToIpa =<<) . mkXSampa) . T.words) - ''; + ipa = wrapScript { + script = ./ipa.py; + name = "ipa"; + packages = [pkgs.python3]; + }; default-gateway = pkgs.writers.writeDashBin "default-gateway" '' ${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway' From 84a69f31dec20d5710b3f4181920e6e2e16f00b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 8 May 2022 09:14:37 +0200 Subject: [PATCH 3/4] fix(nextcloud): start after gnome-keyring --- configs/cloud.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/cloud.nix b/configs/cloud.nix index 6249e16..168a6e7 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -47,11 +47,12 @@ in { enable = true; startInBackground = true; }; - }; - - systemd.user.services.nextcloud-client = { - wants = ["gnome-keyring.service"]; - after = ["gnome-keyring.service"]; + systemd.user.services.nextcloud-client = { + Unit = { + Wants = ["gnome-keyring.service"]; + After = ["gnome-keyring.service"]; + }; + }; }; environment.systemPackages = [ From 94bdfda91b5e94fdfb60e58dc2f4c4e9ed6a0f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 8 May 2022 09:14:48 +0200 Subject: [PATCH 4/4] feat(fonts): add new SIL --- configs/fonts.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/fonts.nix b/configs/fonts.nix index 025921a..ead4350 100644 --- a/configs/fonts.nix +++ b/configs/fonts.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: { +{pkgs, ...}: let + nixpkgs-unstable = import {}; +in { nixpkgs.config.joypixels.acceptLicense = true; fonts = { enableDefaultFonts = true; @@ -7,14 +9,17 @@ alegreya alegreya-sans amiri + nixpkgs-unstable.annapurna-sil cantarell-fonts charis-sil corefonts crimson eb-garamond etBook + nixpkgs-unstable.ezra-sil fira font-awesome-ttf + nixpkgs-unstable.galatia-sil gentium gfs-fonts gyre-fonts @@ -26,7 +31,6 @@ libre-bodoni lmodern merriweather - noto-fonts ocr-a roboto roboto-mono