From 74c5c16c0df8b93ce78b24a2295be81d730b3e35 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Sat, 30 Dec 2023 16:57:58 -0500
Subject: [PATCH] Updgraded to latest versions
---
config/apollo/default.nix | 2 +-
flake.lock | 240 +++++++++++++-------------
pkgs/hardware/common/cups/default.nix | 2 +-
3 files changed, 123 insertions(+), 121 deletions(-)
diff --git a/config/apollo/default.nix b/config/apollo/default.nix
index cd57428..0146fa3 100644
--- a/config/apollo/default.nix
+++ b/config/apollo/default.nix
@@ -5,7 +5,7 @@
../../pkgs/hardware/location/philadelphia
../../pkgs/hardware/locale/en_us
../../pkgs/hardware/common
- ../../pkgs/hardware/common/asus-zenbook-duo
+ #../../pkgs/hardware/common/asus-zenbook-duo
../../pkgs/hardware/common/laptop
../../pkgs/hardware/common/touchpad-disable-tap
#../../pkgs/hardware/common/nvidia_proprietary
diff --git a/flake.lock b/flake.lock
index b704c90..bbbce4f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,14 +4,15 @@
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs",
+ "systems": "systems"
},
"locked": {
- "lastModified": 1696775529,
- "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+ "lastModified": 1703433843,
+ "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
+ "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
"type": "github"
},
"original": {
@@ -150,29 +151,14 @@
"type": "github"
}
},
- "check-flake": {
- "locked": {
- "lastModified": 1662502605,
- "narHash": "sha256-jAT55UhabAxLAVGanxjnNdzH2/oX2ZjLsL4i2jPIP+g=",
- "owner": "srid",
- "repo": "check-flake",
- "rev": "48a17393ed4fcd523399d6602c283775b5127295",
- "type": "github"
- },
- "original": {
- "owner": "srid",
- "repo": "check-flake",
- "type": "github"
- }
- },
"coc-rust-analyzer": {
"flake": false,
"locked": {
- "lastModified": 1700462912,
- "narHash": "sha256-xYJQsSzPOYxTBtREJA/UPAbPup7A8Tq9hN+oJneQkjc=",
+ "lastModified": 1702463495,
+ "narHash": "sha256-pbNIKIIAoiIgvP5DwdHzoFNjL8X7C5fJhYOSkbivJdg=",
"owner": "fannheyward",
"repo": "coc-rust-analyzer",
- "rev": "c06bffaad47994e77d0031fa703314e0da1f9b31",
+ "rev": "4669d5d6441e3942fc5584aaf745f2be427d74b8",
"type": "github"
},
"original": {
@@ -191,11 +177,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1698440846,
- "narHash": "sha256-GKvNrjbuuHoahfGK9V2UMtT6qf91SWLdXrrTITBmR6k=",
+ "lastModified": 1703707084,
+ "narHash": "sha256-27UMbdvgVu1A1zHnte+7RrNYyhtaQWy1yPm5WqLvX8A=",
"owner": "nix-community",
"repo": "comma",
- "rev": "5ecd5024b4e490a0a69628c5ae96506f141551c0",
+ "rev": "cbcec3d8288ade32c39b76cf5087417e5c517397",
"type": "github"
},
"original": {
@@ -212,11 +198,11 @@
]
},
"locked": {
- "lastModified": 1673295039,
- "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+ "lastModified": 1700795494,
+ "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+ "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
@@ -228,7 +214,6 @@
},
"ema": {
"inputs": {
- "check-flake": "check-flake",
"flake-parts": [
"emanote",
"flake-parts"
@@ -251,15 +236,16 @@
]
},
"locked": {
- "lastModified": 1691619338,
- "narHash": "sha256-Nxx184m3caxW5z/EMjVZyuTGi8IPH1qTwMAzJBblWUA=",
+ "lastModified": 1702334080,
+ "narHash": "sha256-zrtzyLrSORxtocLMji5U9p4pDicMulOqgsuiB4LCu1o=",
"owner": "srid",
"repo": "ema",
- "rev": "de01c397e050434f41fc9a12fc40de264dc62c21",
+ "rev": "33f4cf31ace7e612e78ad25f5fc45089745ab644",
"type": "github"
},
"original": {
"owner": "srid",
+ "ref": "no-ws",
"repo": "ema",
"type": "github"
}
@@ -271,11 +257,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1700645991,
- "narHash": "sha256-3TDLDH47xSKLlHYan3hsTjHMXta6QVqgQLsltO1ZbTc=",
+ "lastModified": 1703953082,
+ "narHash": "sha256-hSxSE6vXqLze7yK9NpmGlnkYaLbY4hLfez9riVtvKP8=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "00fe9cdc30398cb126f104a8bebbfaf3b2344ccb",
+ "rev": "dbf41b3900117bb836118f7d3144bae6878a1c5e",
"type": "github"
},
"original": {
@@ -287,22 +273,22 @@
"emanote": {
"inputs": {
"ema": "ema",
+ "emanote-template": "emanote-template",
"flake-parts": "flake-parts",
"flake-root": "flake-root",
- "flake-schemas": "flake-schemas",
"haskell-flake": "haskell-flake",
"heist-extra": "heist-extra",
"nixpkgs": "nixpkgs_3",
- "systems": "systems_3",
+ "systems": "systems_4",
"treefmt-nix": "treefmt-nix",
"unionmount": "unionmount"
},
"locked": {
- "lastModified": 1700408875,
- "narHash": "sha256-sXPGPn3uI+p/uF7C20iReBzkS6mgIBsULWztKSGRmrI=",
+ "lastModified": 1703878530,
+ "narHash": "sha256-s3jjsoBJynDcNrfQSNPApdXt9zyNL2Vfp9vb9T/HA9s=",
"owner": "srid",
"repo": "emanote",
- "rev": "60f9c9575a01741b0cdc72cb934cdbe9afd202a2",
+ "rev": "4ebfa67f3d5ab795fbe04f663f767708527d4980",
"type": "github"
},
"original": {
@@ -311,6 +297,22 @@
"type": "github"
}
},
+ "emanote-template": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1703877265,
+ "narHash": "sha256-2xdikzzHrIHr1s2pAJrBJU8mZP258Na3V4P4RWteDZM=",
+ "owner": "srid",
+ "repo": "emanote-template",
+ "rev": "9d458b63c80162519ae55814e60f17cc9d3f95a3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "srid",
+ "repo": "emanote-template",
+ "type": "github"
+ }
+ },
"flake-compat": {
"flake": false,
"locked": {
@@ -382,11 +384,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
- "lastModified": 1698882062,
- "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
+ "lastModified": 1701473968,
+ "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
+ "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
@@ -403,11 +405,11 @@
]
},
"locked": {
- "lastModified": 1698882062,
- "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
+ "lastModified": 1701473968,
+ "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
+ "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
@@ -464,31 +466,16 @@
"type": "github"
}
},
- "flake-schemas": {
- "locked": {
- "lastModified": 1693615523,
- "narHash": "sha256-LeyH24etXCxNJviWptyLy2DPT9xt+oOs/zE66To1iPY=",
- "owner": "DeterminateSystems",
- "repo": "flake-schemas",
- "rev": "8940e872c4f8c7cd7d0a1ec169fa0a24697b1f1c",
- "type": "github"
- },
- "original": {
- "owner": "DeterminateSystems",
- "repo": "flake-schemas",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
- "systems": "systems_2"
+ "systems": "systems_3"
},
"locked": {
- "lastModified": 1694529238,
- "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -551,11 +538,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1699447920,
- "narHash": "sha256-HVcHwTCLqMW7cWKw0yyUGz2wU5Dz0v8dgclMVnTLA3U=",
+ "lastModified": 1703653834,
+ "narHash": "sha256-k+pxfFoorlE78pNx7vUFOs+mdtVwfH3LRDFXRhC7E2g=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
- "rev": "6750a787c56e1a75b271d2113adb14d37f762d88",
+ "rev": "429ef2392873f2d249096bad07250ce73c88a736",
"type": "github"
},
"original": {
@@ -588,11 +575,11 @@
]
},
"locked": {
- "lastModified": 1682203081,
- "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+ "lastModified": 1703113217,
+ "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+ "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github"
},
"original": {
@@ -608,11 +595,11 @@
]
},
"locked": {
- "lastModified": 1700553346,
- "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=",
+ "lastModified": 1703838268,
+ "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f",
+ "rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
"type": "github"
},
"original": {
@@ -629,11 +616,11 @@
]
},
"locked": {
- "lastModified": 1691882297,
- "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=",
+ "lastModified": 1700847865,
+ "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c3ab5ea047e6dc73df530948f7367455749d8906",
+ "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
"type": "github"
},
"original": {
@@ -644,11 +631,11 @@
},
"mission-control": {
"locked": {
- "lastModified": 1690573269,
- "narHash": "sha256-9NSmHRQvzBzfuKD3zHE2fM5xPa+hHSy7xcWQqZaCjFw=",
+ "lastModified": 1701824311,
+ "narHash": "sha256-WlQZxq+vZhgNpUJ3+MY2tWRmoffKUGUbdV5fPdYi3As=",
"owner": "Platonic-Systems",
"repo": "mission-control",
- "rev": "9d25d9f8d610916fc144f6afc1f064392fbeec1c",
+ "rev": "dfe2bfeae5544fde2f09ca2604add3cf8c5ca7c2",
"type": "github"
},
"original": {
@@ -686,11 +673,11 @@
"utils": "utils_2"
},
"locked": {
- "lastModified": 1688488021,
- "narHash": "sha256-vn6xkx4g2q/qykU+jdQYyGSPKFmGePuhGujAdmlHx1Y=",
+ "lastModified": 1702912615,
+ "narHash": "sha256-qseX+/8drgwxOb1I3LKqBYMkmyeI5d5gmHqbZccR660=",
"owner": "aristanetworks",
"repo": "nix-serve-ng",
- "rev": "f3931b8120b1ca663da280e11659c745e2e9ad1b",
+ "rev": "21e65cb4c62b5c9e3acc11c3c5e8197248fa46a4",
"type": "github"
},
"original": {
@@ -701,11 +688,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1700559156,
- "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
+ "lastModified": 1703879120,
+ "narHash": "sha256-oMJ5xtDswlBWxs0DT/aYKEUIhjEpGZJ9GbIxOclYP8I=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
+ "rev": "22ae59fec26591ef72ce4ccb5538c42c5f090fe3",
"type": "github"
},
"original": {
@@ -734,11 +721,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1677676435,
- "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+ "lastModified": 1703013332,
+ "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+ "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github"
},
"original": {
@@ -769,11 +756,11 @@
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
- "lastModified": 1698611440,
- "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
+ "lastModified": 1701253981,
+ "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
+ "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
},
"original": {
@@ -823,27 +810,27 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1700403855,
- "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
+ "lastModified": 1703467016,
+ "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
+ "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.05",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1700390070,
- "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
+ "lastModified": 1703637592,
+ "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
+ "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"type": "github"
},
"original": {
@@ -855,11 +842,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1693626178,
- "narHash": "sha256-Rpiy6lIOu4zny8tfGuIeN1ji9eSz9nPmm9yBhh/4IOM=",
+ "lastModified": 1702900294,
+ "narHash": "sha256-pt7sSoJYNw3n8YtXw0Z/Nnr6/PfY2YrjDvqboErXnRM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "bfb7dfec93f3b5d7274db109f2990bc889861caf",
+ "rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256",
"type": "github"
},
"original": {
@@ -871,11 +858,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1699099776,
- "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+ "lastModified": 1703255338,
+ "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+ "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github"
},
"original": {
@@ -887,11 +874,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1688403656,
- "narHash": "sha256-zmNai3dKWUCKpKubPWsEJ1Q7od96KebWVDJNCnk+fr0=",
+ "lastModified": 1700856099,
+ "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "453da3c28f7a95374b73d1f3fd665dd40e6049e9",
+ "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
"type": "github"
},
"original": {
@@ -918,11 +905,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1700390070,
- "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
+ "lastModified": 1703637592,
+ "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
+ "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"type": "github"
},
"original": {
@@ -950,11 +937,11 @@
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1691853136,
- "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=",
+ "lastModified": 1700856099,
+ "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f0451844bbdf545f696f029d1448de4906c7f753",
+ "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
"type": "github"
},
"original": {
@@ -1000,11 +987,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1700302760,
- "narHash": "sha256-JpOJf9Nj260rTrVuYonP9CiGzj+43AGPOfhF72XkQvU=",
+ "lastModified": 1703880383,
+ "narHash": "sha256-YAIbWRAKOCaWDQ4A29xXr79VTuAk9lPJSPYhMBk/VjU=",
"owner": "danth",
"repo": "stylix",
- "rev": "a15c3196c1d620c18cbee8229092598384a89fef",
+ "rev": "5a7f3f15ccc2a272e5873bb44fe378ab5d99e0ff",
"type": "github"
},
"original": {
@@ -1073,6 +1060,21 @@
"type": "github"
}
},
+ "systems_5": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@@ -1112,7 +1114,7 @@
},
"utils": {
"inputs": {
- "systems": "systems"
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
@@ -1130,7 +1132,7 @@
},
"utils_2": {
"inputs": {
- "systems": "systems_4"
+ "systems": "systems_5"
},
"locked": {
"lastModified": 1687709756,
diff --git a/pkgs/hardware/common/cups/default.nix b/pkgs/hardware/common/cups/default.nix
index b55345c..8637157 100644
--- a/pkgs/hardware/common/cups/default.nix
+++ b/pkgs/hardware/common/cups/default.nix
@@ -2,7 +2,7 @@
{
services.printing.enable = true;
services.avahi.enable = true;
- services.avahi.nssmdns = true;
+ services.avahi.nssmdns4 = true;
# for a WiFi printer
services.avahi.openFirewall = true;
}
--
GitLab