update nixpkgs

master
Yorick van Pelt 2023-04-23 09:42:35 +02:00
parent 3851e23343
commit 795df06ff1
Signed by: yorick
GPG Key ID: A36E70F9DC014A15
8 changed files with 134 additions and 94 deletions

View File

@ -156,7 +156,7 @@ class MachineInterface {
// machine.ssh.within(machine.toplevel.activate("boot"))
await machineSSH("root", async () => {
await $`nix-env -p /nix/var/nix/profiles/system --set ${path.path}`
await $`${path}/bin/switch-to-configuration boot`
await $`${path.path as string}/bin/switch-to-configuration boot`
})
}
@cmd

View File

@ -1,20 +1,6 @@
(pkgs: super: {
# with pkgs.lib.firefoxOverlay; firefoxVariants.firefox-bin // { info = versionInfo firefoxVariants.firefox-bin; }
firefox-109 = pkgs.lib.firefoxOverlay.firefoxVersion {
info = {
chksum = "https://download.cdn.mozilla.net/pub/firefox/releases/109.0/SHA512SUMS";
chksumSha256 = "0f851278012fb0ed7b7d9fb380a500d3a4dc51b6bc54cae4ec0b8d5bb49540fd";
chksumSig = "https://download.cdn.mozilla.net/pub/firefox/releases/109.0/SHA512SUMS.asc";
chksumSigSha256 = "9d1c34b74e7f921b0e10a00afbcb3083699da06c969e45ea1315228b8c613d11";
file = "linux-x86_64/en-US/firefox-109.0.tar.bz2";
sha512 = "570e54faf9508fe77ba21e97b2e75198349012498e4339066f99d2059cb6021c0a25c9212706d28bd605dfd9d800587767253bf466a90b3ef94f79334b4e9acc";
sig = null;
sigSha512 = null;
url = "https://download.cdn.mozilla.net/pub/firefox/releases/109.0/linux-x86_64/en-US/firefox-109.0.tar.bz2";
};
name = "Firefox";
release = true;
version = "109.0";
wmClass = "firefox";
};
# https://github.com/nix-community/emacs-overlay/issues/312#issuecomment-1506416929
emacsUnstablePgtk = super.emacsUnstablePgtk.overrideAttrs (prev: {
postFixup = builtins.replaceStrings [ "/bin/emacs" ] [ "/bin/.emacs-*-wrapped" ] prev.postFixup;
});
})

View File

@ -2,16 +2,17 @@
"nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1673301561,
"narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
"lastModified": 1682101079,
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
"owner": "ryantm",
"repo": "agenix",
"rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
"type": "github"
},
"original": {
@ -36,6 +37,28 @@
"type": "gitlab"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673295039,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
@ -44,11 +67,11 @@
]
},
"locked": {
"lastModified": 1674032919,
"narHash": "sha256-5tHaGJsZW6EXHAPogAbHObk6OKWmLDRSkpbAmLtgol8=",
"lastModified": 1682187467,
"narHash": "sha256-Mh2ETdqfFLflMK1hKgxVVE3/A/4xhG10FXst+piVla4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "d0d9310e383f25872db7dea6a2b60dbc13db9ee4",
"rev": "2afeb0596418d37aa3feb7203cc37a11c10c83fe",
"type": "github"
},
"original": {
@ -73,17 +96,16 @@
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"lastModified": 1680531544,
"narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"rev": "95e78dc12268c5e4878621845c511077f3798729",
"type": "github"
},
"original": {
"owner": "edolstra",
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
@ -97,11 +119,11 @@
]
},
"locked": {
"lastModified": 1673362319,
"narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=",
"lastModified": 1680392223,
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f",
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
"type": "github"
},
"original": {
@ -126,12 +148,15 @@
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -140,12 +165,15 @@
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -158,15 +186,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
]
},
"locked": {
"lastModified": 1674041176,
"narHash": "sha256-cMf1BQzI39nHQ0H/mOatthbbI3392qLmJ9gU0u520P4=",
"lastModified": 1682176386,
"narHash": "sha256-xwYjQ8PjfdHlggi8Dq0PXWby/1oXegSUuNuBvoTcnpA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2c29ae48f9a149151bdd82f429ac61d4412c312a",
"rev": "6169690ae38175295605d521bd778d999fbd85cd",
"type": "github"
},
"original": {
@ -180,11 +207,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1673784491,
"narHash": "sha256-Av6g/hjJjK/QRnO2eZle5K2LiXWVIUwERInSMXxq34c=",
"lastModified": 1681214977,
"narHash": "sha256-pBaG4iKzF/YJQA06f87IZokB15Z13DYd6zsT/wlbWfI=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "53fd425d429ec2341d13b479478611622b944a69",
"rev": "19d70ca7a81956bd01a768297b84798f301e150f",
"type": "github"
},
"original": {
@ -196,17 +223,14 @@
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs-wayland",
"nixpkgs"
]
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1673832069,
"narHash": "sha256-xu33HFqVtuQlK89WghvgAeUZaQ8rrYlDzAmKjop4vtk=",
"lastModified": 1681421147,
"narHash": "sha256-VSxwnvZFR8Kro784wG75D+FnhhqS1ObhQacFKIp42W4=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "11a99e5b1b801e7ce73f09df7ff86b173612f9ef",
"rev": "a5bb26e9ea62b160df617577ff97ab778d5221aa",
"type": "github"
},
"original": {
@ -222,11 +246,11 @@
]
},
"locked": {
"lastModified": 1674357402,
"narHash": "sha256-oxOCYORXBh0KW4KEwKpzs2LThDdVmEwREV+SsP4CIpg=",
"lastModified": 1681591833,
"narHash": "sha256-lW+xOELafAs29yw56FG4MzNOFkh8VHC/X/tRs1wsGn8=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "e9e7c5c62965e7e656febb5ba578d53f751eb41f",
"rev": "68ec961c51f48768f72d2bbdb396ce65a316677e",
"type": "github"
},
"original": {
@ -257,11 +281,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1673803274,
"narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=",
"lastModified": 1680876084,
"narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3",
"rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
"type": "github"
},
"original": {
@ -277,7 +301,7 @@
"nixpkgs"
],
"nixpkgs-22_11": "nixpkgs-22_11",
"utils": "utils_2"
"utils": "utils"
},
"locked": {
"lastModified": 1671738303,
@ -295,11 +319,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1673796341,
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
"lastModified": 1681920287,
"narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
"rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
"type": "github"
},
"original": {
@ -326,11 +350,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1673743903,
"narHash": "sha256-sloY6KYyVOozJ1CkbgJPpZ99TKIjIvM+04V48C04sMQ=",
"lastModified": 1681001314,
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "7555e2dfcbac1533f047021f1744ac8871150f9f",
"rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4",
"type": "github"
},
"original": {
@ -341,11 +365,11 @@
},
"nixpkgs-mozilla": {
"locked": {
"lastModified": 1672878308,
"narHash": "sha256-0+fl6PHokhtSV+w58z2QD2rTf8QhcOGsT9o4LwHHZHE=",
"lastModified": 1677493379,
"narHash": "sha256-A1gO8zlWLv3+tZ3cGVB1WYvvoN9pbFyv0xIJHcTsckw=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "d38863db88e100866b3e494a651ee4962b762fcc",
"rev": "78e723925daf5c9e8d0a1837ec27059e61649cb6",
"type": "github"
},
"original": {
@ -380,11 +404,11 @@
]
},
"locked": {
"lastModified": 1674056257,
"narHash": "sha256-+tAlW7NuH9h5vhgmxWuRDm8Dt3azMxoHgS06Fjj79tI=",
"lastModified": 1682158400,
"narHash": "sha256-lvtdyZnnkggmKLrVH/WUu+PKJmlN/TNHKfXF2tuK+dY=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "7a4024885b31fecd4856a6bfeb30a5009c2f76dc",
"rev": "9aa2c3286d094b1783e279b5ae52ddcc0e338889",
"type": "github"
},
"original": {
@ -393,6 +417,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1681347147,
"narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -409,22 +449,37 @@
"nixpkgs-wayland": "nixpkgs-wayland"
}
},
"utils": {
"systems": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"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"
}
},
"utils_2": {
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1605370193,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",

View File

@ -94,7 +94,7 @@
nixpkgs-wayland.overlay
nixpkgs-mozilla.overlay
emacs-overlay.overlay
agenix.overlay
agenix.overlays.default
(import ./fixups.nix)
(import ./pkgs)
(import ./pkgs/mdr.nix)

View File

@ -109,12 +109,12 @@ in {
output."Sharp Corporation 0x144A Unknown".bg = bg.xps9360;
# desk
output."HYC CO., LTD. Unknown" = {
output."HYC CO., LTD. DUAL-DVI Unknown" = {
position = "0 0";
bg = bg.desktop;
max_render_time = "4";
};
output."HYC CO., LTD. " = {
output."HYC CO., LTD. DUAL-DVI" = {
position = "0 0";
bg = bg.desktop;
};
@ -162,11 +162,8 @@ in {
'';
};
programs.firefox = {
enable = true;
# TODO (update) remove
package = pkgs.firefox-109;
};
programs.firefox.enable = true;
home.sessionVariables = {
MOZ_USE_XINPUT2 = "1";
MOZ_ENABLE_WAYLAND = "1";
@ -179,6 +176,7 @@ in {
XCURSOR_THEME = "Adwaita";
XCURSOR_PATH = "${pkgs.gnome.adwaita-icon-theme}/share/icons";
XDG_CURRENT_DESKTOP = "sway";
NIXOS_OZONE_WL = "1";
};
systemd.user.services.wayland-push-to-talk-fix = let
kbd = "/dev/input/by-id/usb-Kinesis_Advantage2_Keyboard_314159265359-if01-event-kbd";

View File

@ -1,9 +1,9 @@
{ lib, config, options, pkgs, ... }: let
epkgs = pkgs.emacsPackagesFor pkgs.emacsPgtk;
epkgs = pkgs.emacsPackagesFor pkgs.emacsUnstablePgtk;
in {
programs.emacs = {
enable = true;
package = pkgs.emacsPgtk;
package = pkgs.emacsUnstablePgtk;
extraConfig = ''
(setq copilot-node-executable "${pkgs.nodejs-slim-16_x}/bin/node")
(setq lsp-nix-server-path "${pkgs.nil}/bin/nil")

View File

@ -4,7 +4,7 @@ let
vpn = import ../vpn.nix;
in {
imports = [
inputs.agenix.nixosModule
inputs.agenix.nixosModules.default
../modules/acme-sh.nix
../modules/tor-hidden-service.nix
../modules/nginx.nix

View File

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
{
services.fwupd.enable = true;
programs.fish.enable = true;
users.users.yorick = {
extraGroups = [ "input" "wireshark" "dialout" "video" "libvirtd" ];
shell = pkgs.fish;