From 7da07a5e1ff80d603163e660cfd6a4057e54f864 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 4 Jan 2025 19:47:12 +0100 Subject: ... --- _sources/generated.json | 8 +-- _sources/generated.nix | 8 +-- accounts/gkleen@sif/default.nix | 4 +- flake.lock | 80 ++++++++++----------- flake.nix | 6 +- hosts/vidhar/default.nix | 2 +- modules/uucp.nix | 27 +------ overlays/uucp/default.nix | 9 +++ overlays/uucp/mailprogram.patch | 16 +++++ overlays/wttrbar/default.nix | 7 -- overlays/wttrbar/icons.patch | 154 ---------------------------------------- 11 files changed, 81 insertions(+), 240 deletions(-) create mode 100644 overlays/uucp/default.nix create mode 100644 overlays/uucp/mailprogram.patch delete mode 100644 overlays/wttrbar/default.nix delete mode 100644 overlays/wttrbar/icons.patch diff --git a/_sources/generated.json b/_sources/generated.json index 0e375871..47e088c4 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -36,7 +36,7 @@ }, "bpf-examples": { "cargoLocks": null, - "date": "2024-01-31", + "date": "2025-01-03", "extract": null, "name": "bpf-examples", "passthru": null, @@ -48,12 +48,12 @@ "name": null, "owner": "xdp-project", "repo": "bpf-examples", - "rev": "5343ed3377471c7b7ef2237526c8bdc0f00a0cef", - "sha256": "sha256-vKVI8pQ17BNWLKm8wwpyNkLslnB9E2CAZTS6EP5lDT0=", + "rev": "8d53e6fc46ae625bd16b38eb1007ece99460eada", + "sha256": "sha256-BUncjyaywmtSMVhbWZDy9XiNlGJet8Z0lzmUqm3f+HU=", "sparseCheckout": [], "type": "github" }, - "version": "5343ed3377471c7b7ef2237526c8bdc0f00a0cef" + "version": "8d53e6fc46ae625bd16b38eb1007ece99460eada" }, "emacs-scratch_el": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 1f828220..161dc4e1 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -26,15 +26,15 @@ }; bpf-examples = { pname = "bpf-examples"; - version = "5343ed3377471c7b7ef2237526c8bdc0f00a0cef"; + version = "8d53e6fc46ae625bd16b38eb1007ece99460eada"; src = fetchFromGitHub { owner = "xdp-project"; repo = "bpf-examples"; - rev = "5343ed3377471c7b7ef2237526c8bdc0f00a0cef"; + rev = "8d53e6fc46ae625bd16b38eb1007ece99460eada"; fetchSubmodules = true; - sha256 = "sha256-vKVI8pQ17BNWLKm8wwpyNkLslnB9E2CAZTS6EP5lDT0="; + sha256 = "sha256-BUncjyaywmtSMVhbWZDy9XiNlGJet8Z0lzmUqm3f+HU="; }; - date = "2024-01-31"; + date = "2025-01-03"; }; emacs-scratch_el = { pname = "emacs-scratch_el"; diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 68faa201..23525791 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -160,7 +160,7 @@ in { yaml-mode json-mode shakespeare-mode smart-mode-line highlight-parentheses highlight-symbol ag sass-mode lua-mode fira-code-mode use-package wanderlust # notmuch - use-package-ensure-system-package git-gutter emacsScratch + git-gutter emacsScratch edit-server mediawiki editorconfig typescript-mode markdown-mode nftables-mode rustic lsp-mode lsp-ui direnv company projectile tomorrow-night-paradise-theme @@ -278,7 +278,7 @@ in { format = "{}"; tooltip = true; interval = 3600; - exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"{ICON} {FeelsLikeC}°\""; + exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"{ICON} {FeelsLikeC}°\""; return-type = "json"; }; "custom/keymap" = { diff --git a/flake.lock b/flake.lock index 56b571ca..ad8b803f 100644 --- a/flake.lock +++ b/flake.lock @@ -168,11 +168,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "flake-registry": { "flake": false, "locked": { - "lastModified": 1717415742, - "narHash": "sha256-HKvoLGZUsBpjkxWkdtctGYj6RH0bl6vcw0OjTOqyzJk=", + "lastModified": 1734450202, + "narHash": "sha256-/3gigrEBFORQs6a8LL5twoHs7biu08y/8Xc5aQmk3b0=", "owner": "NixOS", "repo": "flake-registry", - "rev": "895a65f8d5acf848136ee8fe8e8f736f0d27df96", + "rev": "02fe640c9e117dd9d6a34efc7bcb8bd09c08111d", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1722322032, - "narHash": "sha256-pnO44gA8GcJj3oCVeGmypSGLr10+usMbJXochJWdugw=", + "lastModified": 1736014120, + "narHash": "sha256-ZrI+mcuQfal5IfT4HsxVEiiFNAgV4qYh+B4/NyXxpAs=", "owner": "gkleen", "repo": "home-manager", - "rev": "55c1d61f06fd331f874178a6028f22be22ee7878", + "rev": "99e8412a18eb7e0731aa2b77abeed00d6d1863ad", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1734945620, + "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "type": "github" }, "original": { @@ -413,11 +413,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1732406038, - "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=", + "lastModified": 1735412232, + "narHash": "sha256-W9wRlNvQLfV21359gTr3DglRBA6Q7NPUSU4RzgAAGsk=", "owner": "AshleyYakeley", "repo": "NixVirt", - "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67", + "rev": "55367360c00bd304042e5ad90841fd399330b77a", "type": "github" }, "original": { @@ -449,11 +449,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -509,14 +509,14 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-lib_3": { @@ -603,16 +603,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", - "owner": "NixOS", + "lastModified": 1736013918, + "narHash": "sha256-5nGpp/IkUczGOu/flzHO+C05K3QljD5KuQUS/c2ZjUY=", + "owner": "gkleen", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "3a711bcb55711f7ed475c618e77c45e69a54732d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "gkleen", + "ref": "fix/matrix-synapse", "repo": "nixpkgs", "type": "github" } @@ -673,11 +673,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731205797, - "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", + "lastModified": 1735852239, + "narHash": "sha256-Xrg/HahR9SW1UzT5pwtpQR6D12ZIwwHjxav9YzB1q4U=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", + "rev": "bb182fd661f5f8a7d6c50dd44cf9a6ddca7ccc1a", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1734261738, + "narHash": "sha256-3Lzk+7QyX8v60+km26D3dln7NMSA13vW+KYTkMkds6Q=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "4c8e75efbbdcc6f9203f64b1f21f8a55d2285264", "type": "github" }, "original": { @@ -815,11 +815,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1735844895, + "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cd50543e..c6eaab47 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,11 @@ inputs = { nixpkgs = { type = "github"; - owner = "NixOS"; + # owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable"; + # ref = "nixos-unstable"; + owner = "gkleen"; + ref = "fix/matrix-synapse"; }; nixpkgs-pgbackrest = { type = "github"; diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index d9bc53f2..b0797d8a 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix @@ -136,7 +136,7 @@ with lib; wantedBy = ["basic.target"]; serviceConfig = { ExecStart = pkgs.writeShellScript "limit-pstate-start" '' - echo 60 > /sys/devices/system/cpu/intel_pstate/max_perf_pct + echo 50 > /sys/devices/system/cpu/intel_pstate/max_perf_pct ''; RemainAfterExit = true; ExecStop = pkgs.writeShellScript "limit-pstate-stop" '' diff --git a/modules/uucp.nix b/modules/uucp.nix index abca2acb..10f7297b 100644 --- a/modules/uucp.nix +++ b/modules/uucp.nix @@ -314,32 +314,7 @@ in { in listToAttrs (map wrapper ["uucico" "cu" "uucp" "uuname" "uustat" "uux" "uuxqt"]); nixpkgs.overlays = [(self: super: { - uucp = super.lib.overrideDerivation super.uucp (oldAttrs: { - configureFlags = "--with-newconfigdir=/etc/uucp"; - patches = [ - (super.writeText "mailprogram" '' - policy.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - diff --git a/policy.h b/policy.h - index 5afe34b..8e92c8b 100644 - --- a/policy.h - +++ b/policy.h - @@ -240,7 +240,7 @@ - the sendmail choice below. Otherwise, select one of the other - choices as appropriate. */ - #if 1 - -#define MAIL_PROGRAM "/usr/lib/sendmail -t" - +#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t" - /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */ - #define MAIL_PROGRAM_TO_BODY 1 - #define MAIL_PROGRAM_SUBJECT_BODY 1 - '') - ]; - }); - rmail = super.writeScriptBin "rmail" '' - #!${super.stdenv.shell} - + rmail = super.writeShellScriptBin "rmail" '' # Dummy UUCP rmail command for postfix/qmail systems IFS=" " read junk from junk junk junk junk junk junk junk relay diff --git a/overlays/uucp/default.nix b/overlays/uucp/default.nix new file mode 100644 index 00000000..4189dbcc --- /dev/null +++ b/overlays/uucp/default.nix @@ -0,0 +1,9 @@ +{ final, prev, ... }: { + uucp = prev.uucp.overrideAttrs (oldAttrs: { + configureFlags = (oldAttrs.configureFlags or []) ++ ["--with-newconfigdir=/etc/uucp"]; + patches = (oldAttrs.patches or []) ++ [ + ./mailprogram.patch + ]; + NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE or ""} -Wno-error=incompatible-pointer-types"; + }); +} diff --git a/overlays/uucp/mailprogram.patch b/overlays/uucp/mailprogram.patch new file mode 100644 index 00000000..89ac8f31 --- /dev/null +++ b/overlays/uucp/mailprogram.patch @@ -0,0 +1,16 @@ + policy.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/policy.h b/policy.h +index 5afe34b..8e92c8b 100644 +--- a/policy.h ++++ b/policy.h +@@ -240,7 +240,7 @@ + the sendmail choice below. Otherwise, select one of the other + choices as appropriate. */ + #if 1 +-#define MAIL_PROGRAM "/usr/lib/sendmail -t" ++#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t" + /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */ + #define MAIL_PROGRAM_TO_BODY 1 + #define MAIL_PROGRAM_SUBJECT_BODY 1 diff --git a/overlays/wttrbar/default.nix b/overlays/wttrbar/default.nix deleted file mode 100644 index 876fa699..00000000 --- a/overlays/wttrbar/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ prev, ... }: { - wttrbar = prev.wttrbar.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) ++ [ - ./icons.patch - ]; - }); -} diff --git a/overlays/wttrbar/icons.patch b/overlays/wttrbar/icons.patch deleted file mode 100644 index e7e721c8..00000000 --- a/overlays/wttrbar/icons.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/src/constants.rs b/src/constants.rs -index 81b1926..3619d8f 100644 ---- a/src/constants.rs -+++ b/src/constants.rs -@@ -1,64 +1,52 @@ - pub const WEATHER_CODES: &[(i32, &str)] = &[ -- (113, "☀ī¸"), -- (116, "🌤ī¸"), -- (119, "☁ī¸"), -- (122, "đŸŒĨī¸"), -- (143, "đŸŒĢī¸"), -- (176, "đŸŒĻī¸"), -- (179, "🌧ī¸"), -- (182, "🌨ī¸"), -- (185, "🌨ī¸"), -- (200, "🌩ī¸"), -- (227, "❄ī¸"), -- (230, "❄ī¸"), -- (248, "đŸŒĢī¸"), -- (260, "đŸŒĢī¸"), -- (263, "🌧ī¸"), -- (266, "🌧ī¸"), -- (281, "đŸŒĻī¸"), -- (284, "đŸŒĻī¸"), -- (293, "🌧ī¸"), -- (296, "🌧ī¸"), -- (299, "🌧ī¸"), -- (302, "🌧ī¸"), -- (305, "🌧ī¸"), -- (308, "🌧ī¸"), -- (311, "🌧ī¸"), -- (314, "🌧ī¸"), -- (317, "🌧ī¸"), -- (320, "🌨ī¸"), -- (323, "🌨ī¸"), -- (326, "🌨ī¸"), -- (329, "🌨ī¸"), -- (332, "🌨ī¸"), -- (335, "🌨ī¸"), -- (338, "🌨ī¸"), -- (350, "🌨ī¸"), -- (353, "🌧ī¸"), -- (356, "🌧ī¸"), -- (359, "🌧ī¸"), -- (362, "🌨ī¸"), -- (365, "🌨ī¸"), -- (368, "🌨ī¸"), -- (371, "🌨ī¸"), -- (374, "🌨ī¸"), -- (377, "🌨ī¸"), -- (386, "🌩ī¸"), -- (389, "🌨ī¸"), -- (392, "🌨ī¸"), -- (395, "🌨ī¸"), -- (398, "🌨ī¸"), -- (401, "🌨ī¸"), -- (404, "🌨ī¸"), -- (407, "🌨ī¸"), -- (410, "🌨ī¸"), -- (413, "🌨ī¸"), -- (416, "🌨ī¸"), -- (419, "🌨ī¸"), -- (422, "🌨ī¸"), -- (425, "🌨ī¸"), -- (428, "🌨ī¸"), -- (431, "🌨ī¸"), -+ (113, ""), -+ (116, ""), -+ (119, "îŒŊ"), -+ (122, ""), -+ (143, ""), -+ (176, ""), -+ (179, ""), -+ (182, "îŽĒ"), -+ (185, "îŽĒ"), -+ (200, ""), -+ (227, ""), -+ (230, ""), -+ (248, ""), -+ (260, ""), -+ (263, ""), -+ (266, ""), -+ (281, "îŽĒ"), -+ (284, "îŽĒ"), -+ (293, ""), -+ (296, ""), -+ (299, ""), -+ (302, ""), -+ (305, ""), -+ (308, ""), -+ (311, "îŽĒ"), -+ (314, "îŽĒ"), -+ (317, "îŽĒ"), -+ (320, ""), -+ (323, ""), -+ (326, ""), -+ (329, ""), -+ (332, ""), -+ (335, ""), -+ (338, ""), -+ (350, "îŽĒ"), -+ (353, ""), -+ (356, ""), -+ (359, ""), -+ (362, ""), -+ (365, ""), -+ (368, ""), -+ (371, ""), -+ (374, ""), -+ (377, "îŽĒ"), -+ (386, ""), -+ (389, ""), -+ (392, "îĨ"), -+ (395, ""), - ]; - - pub const ICON_PLACEHOLDER: &str = "{ICON}"; -diff --git a/src/main.rs b/src/main.rs -index 6ac4654..1b84207 100644 ---- a/src/main.rs -+++ b/src/main.rs -@@ -175,20 +175,20 @@ fn main() { - - if args.fahrenheit { - tooltip += &format!( -- "âŦ†ī¸ {}° âŦ‡ī¸ {}° ", -+ "ķ°¸ƒ {}° ķ°¸‚ {}° ", - day["maxtempF"].as_str().unwrap(), - day["mintempF"].as_str().unwrap(), - ); - } else { - tooltip += &format!( -- "âŦ†ī¸ {}° âŦ‡ī¸ {}° ", -+ "ķ°¸ƒ {}° ķ°¸‚ {}° ", - day["maxtempC"].as_str().unwrap(), - day["mintempC"].as_str().unwrap(), - ); - }; - - tooltip += &format!( -- "🌅 {} 🌇 {}\n", -+ " {}  {}\n", - format_ampm_time(day, "sunrise", args.ampm), - format_ampm_time(day, "sunset", args.ampm), - ); -@@ -207,7 +207,7 @@ fn main() { - } - - let mut tooltip_line = format!( -- "{} {} {} {}", -+ "{} {}{} {}", - format_time(hour["time"].as_str().unwrap(), args.ampm), - WEATHER_CODES - .iter() -- cgit v1.2.3