diff --git a/flake.lock b/flake.lock index 595341f..2d6529c 100644 --- a/flake.lock +++ b/flake.lock @@ -706,11 +706,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1740852064, - "narHash": "sha256-A2zUu1n8Bg505s/GUIYUSQFLmYJAvx/01A2OkGAkevk=", + "lastModified": 1733363815, + "narHash": "sha256-J2XTeJ0xQMPPo2QnPLM1ewhqCh/Okgfonr5N6Pdt7b8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1b34da949d188b205b4132c2b726415fa19d5086", + "rev": "ffe6b403ba758f8a057a227de2f7235ef3dc61c0", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740547748, - "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a05eebede89661660945da1f151959900903b6a", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "type": "github" }, "original": { @@ -990,6 +990,22 @@ "type": "github" } }, + "nixpkgs-kanidm": { + "locked": { + "lastModified": 1729071019, + "narHash": "sha256-c4J/ZiMbjMf98FawO5XJaTWqvrvIXpxnIpxu4OV3CGA=", + "owner": "steveej-forks", + "repo": "nixpkgs", + "rev": "984b1d5a286d3a072b840b30ec49d96878d01e64", + "type": "github" + }, + "original": { + "owner": "steveej-forks", + "ref": "kanidm", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1733096140, @@ -1017,6 +1033,22 @@ "type": "github" } }, + "nixpkgs-logseq": { + "locked": { + "lastModified": 1735042470, + "narHash": "sha256-3A8afs4dVdbafOG4Rgg5ie2wk8b6ekzOce8JNNXq4/w=", + "owner": "steveej-forks", + "repo": "nixpkgs", + "rev": "24134ba2d4c2bb54e3736b3c66c0ba95551f2834", + "type": "github" + }, + "original": { + "owner": "steveej-forks", + "ref": "logseq-linux-arm64-selfbuilt-appimage", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1739446958, @@ -1281,6 +1313,8 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-gimp": "nixpkgs-gimp", + "nixpkgs-kanidm": "nixpkgs-kanidm", + "nixpkgs-logseq": "nixpkgs-logseq", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-vscodium": "nixpkgs-vscodium", "nixpkgs-wayland": "nixpkgs-wayland", diff --git a/flake.nix b/flake.nix index 72eceec..a8cfb9d 100644 --- a/flake.nix +++ b/flake.nix @@ -81,13 +81,14 @@ flake = false; }; - # nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage"; + nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage"; espanso = { flake = false; url = "github:espanso/espanso/db97658d1d80697a635b57801696c594eacf057b"; }; + nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm"; nix4vscode = { url = "github:nix-community/nix4vscode"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/devShells.nix b/nix/devShells.nix index aa4eda5..f55f056 100644 --- a/nix/devShells.nix +++ b/nix/devShells.nix @@ -83,7 +83,7 @@ screen - inputs'.nixpkgs-unstable.legacyPackages.kanidm + inputs'.nixpkgs-kanidm.legacyPackages.kanidm ]; # Set Environment Variables diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index d5b69c2..4363d05 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -106,6 +106,7 @@ in # Password Management gnupg # yubikey-manager + yubikey-manager-qt yubikey-personalization yubikey-personalization-gui @@ -244,8 +245,7 @@ in # libretro.snes9x2010 # retroarchFull - pkgs.logseq-bin - # (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq-bin/package.nix" { }) + (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" { }) ]) ++ (with repoFlake.packages.${pkgs.system}; [ gimp ]) ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix index 77f6e57..e51dd7b 100644 --- a/nix/home-manager/profiles/common.nix +++ b/nix/home-manager/profiles/common.nix @@ -15,12 +15,14 @@ allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ - "electron-32.3.3" + "electron-28.3.3" + "electron-27.3.11" "electron" ]; permittedInsecurePackages = [ - "electron-32.3.3" + "electron-28.3.3" + "electron-27.3.11" "electron" ]; diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix index df72028..3aa5b9a 100644 --- a/nix/home-manager/programs/vscode/default.nix +++ b/nix/home-manager/programs/vscode/default.nix @@ -45,17 +45,16 @@ in with extensions.vscode-marketplace; with extensions.vscode-marketplace-release; [ + tamasfe.even-better-toml serayuzgur.crates rust-lang.rust-analyzer swellaby.vscode-rust-test-adapter - tamasfe.even-better-toml golang.go jeff-hykin.better-go-syntax + blueglassblock.better-json5 - nefrob.vscode-just-syntax - # fabianlauer.vs-code-xml-format bierner.emojisense ] @@ -76,16 +75,7 @@ in [[extensions]] publisher_name = "AntiAntiSepticeye" extension_name = "vscode-color-picker" - - # [[extensions]] - # publisher_name = "nefrob" - # extension_name = "vscode-just-syntax" - - [[extensions]] - publisher_name = "fabianlauer" - extension_name = "vs-code-xml-format" ''; - nix4vscodeNix = pkgs.runCommand "nix4vscode.nix" { diff --git a/nix/os/containers/webserver.nix b/nix/os/containers/webserver.nix index 10bc091..b20fa28 100644 --- a/nix/os/containers/webserver.nix +++ b/nix/os/containers/webserver.nix @@ -23,12 +23,6 @@ in system, ... }: - let - nixpkgs-kanidm = - # nodeFlake.inputs.nixpkgs-kanidm - nodeFlake.inputs.nixpkgs-unstable - ; - in { system.stateVersion = "22.05"; # Did you read the comment? @@ -39,7 +33,7 @@ in imports = [ "${nodeFlake.inputs.nixpkgs-unstable}/nixos/modules/services/misc/forgejo.nix" - "${nixpkgs-kanidm}/nixos/modules/services/security/kanidm.nix" + "${repoFlake.inputs.nixpkgs-kanidm}/nixos/modules/services/security/kanidm.nix" ../profiles/containers/configuration.nix @@ -319,7 +313,6 @@ in systemd.services.lldap.serviceConfig.DynamicUser = lib.mkForce false; # combine a path watcher with a service that transfers the certs by caddy to kanidm - # TODO: had an issue where the certificate in kanidm was expired, despite caddy having a refreshed certificate systemd.paths.kanidm-tls-watch = { enable = true; requiredBy = [ "kanidm.service" ]; @@ -396,7 +389,7 @@ in dataDir = "/var/lib/kanidm"; in { - package = nixpkgs-kanidm.legacyPackages.${pkgs.system}.kanidm; + package = repoFlake.inputs.nixpkgs-kanidm.legacyPackages.${pkgs.system}.kanidm; enablePam = false; enableClient = false; @@ -409,6 +402,7 @@ in domain = "kanidm.${domain}"; origin = "https://kanidm.${domain}"; + db_path = "${dataDir}/db/kanidm.db"; bindaddress = "127.0.0.1:8444"; diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index 9961108..ca3df1d 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -37,29 +37,13 @@ "type": "github" } }, - "nixpkgs-kanidm": { - "locked": { - "lastModified": 1729071019, - "narHash": "sha256-c4J/ZiMbjMf98FawO5XJaTWqvrvIXpxnIpxu4OV3CGA=", - "owner": "steveej-forks", - "repo": "nixpkgs", - "rev": "984b1d5a286d3a072b840b30ec49d96878d01e64", - "type": "github" - }, - "original": { - "owner": "steveej-forks", - "ref": "kanidm", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-master": { "locked": { - "lastModified": 1743256265, - "narHash": "sha256-1GJtabBAEwSkwKgSBe+osLCYwcRr5zx5H7ipuoVkO/4=", + "lastModified": 1739263600, + "narHash": "sha256-f0k9Kf+kpRqieSf9nlRMLyWe5oujqSOwaNWSyfwMiIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5dab1e63b3efccf767a54b0b978b41fe7410aff0", + "rev": "f9e486552fc8213d31cadd772fc883789f76199d", "type": "github" }, "original": { @@ -71,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743210622, - "narHash": "sha256-AagCXne3DGJARB7kxCjcBgJddT/J2CC7SSe7I6kFqso=", + "lastModified": 1739184465, + "narHash": "sha256-7Z9kNbr6qZwPG1z/6Hn/re4SS9nu1krxyknyNeCBh/o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "800863744b6d0ef3c748a094a15e7f9d361f62fb", + "rev": "58edd1e2acbc9be9fe29964344c6419db013141e", "type": "github" }, "original": { @@ -89,7 +73,6 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-kanidm": "nixpkgs-kanidm", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/nix/os/devices/sj-srv1/flake.nix b/nix/os/devices/sj-srv1/flake.nix index 213d325..f5f7b6e 100644 --- a/nix/os/devices/sj-srv1/flake.nix +++ b/nix/os/devices/sj-srv1/flake.nix @@ -3,8 +3,6 @@ inputs.nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; inputs.nixpkgs-master.url = "github:nixos/nixpkgs/master"; - inputs.nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm"; - inputs.home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/os/devices/sj-srv1/system.nix b/nix/os/devices/sj-srv1/system.nix index c5e4c43..5aea904 100644 --- a/nix/os/devices/sj-srv1/system.nix +++ b/nix/os/devices/sj-srv1/system.nix @@ -207,8 +207,7 @@ in parallelShutdown = 3; }; - # VM storage - # fileSystems."/mnt/8078-532D".device = "/dev/disk/by-uuid/8078-532D"; + fileSystems."/mnt/8078-532D".device = "/dev/disk/by-uuid/8078-532D"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/nix/os/devices/steveej-x13s/configuration.nix b/nix/os/devices/steveej-x13s/configuration.nix index 316dc8d..472fcb5 100644 --- a/nix/os/devices/steveej-x13s/configuration.nix +++ b/nix/os/devices/steveej-x13s/configuration.nix @@ -84,15 +84,6 @@ ../../snippets/mycelium.nix nodeFlake.inputs.extra-container.nixosModules.default - { - networking.nat = { - enable = true; - internalInterfaces = ["ve-+"]; - # externalInterface = "enu1u1u2"; - # Lazy IPv6 connectivity for the container - # enableIPv6 = true; - }; - } # TODO: broken with: v4l2loopback-0.13.2-6.13.0-rc3.drv # make: *** [Makefile:53: v4l2loopback.ko] Error 2 diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index b0fd80a..b92be30 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -3,11 +3,11 @@ "ath11k-firmware": { "flake": false, "locked": { - "lastModified": 1741293326, - "narHash": "sha256-Ew0d2h1pHqJB8SC0pEYezU5lMknvlcYazVVYCtjW3OY=", + "lastModified": 1739552113, + "narHash": "sha256-jO57Sqz/9BGgTfECm4Cs9yi8uFcd3YxpJjG5J7sj4Z8=", "ref": "refs/heads/main", - "rev": "bc6359cb7ad38b7bc4de6580b7a3c70851c0cafb", - "revCount": 173, + "rev": "eb147907112ebb2874426f679ed722201548cc33", + "revCount": 167, "type": "git", "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git" }, @@ -17,12 +17,18 @@ } }, "crane": { + "inputs": { + "nixpkgs": [ + "mycelium", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1742317686, - "narHash": "sha256-ScJYnUykEDhYeCepoAWBbZWx2fpQ8ottyvOyGry7HqE=", + "lastModified": 1717951870, + "narHash": "sha256-hGLeRxSEeFz9WvmQ4s4AuMJ5InLSZvoczDdXkWSFi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb", + "rev": "17d9e9dedd58dde2c562a4296934c6d6a0844534", "type": "github" }, "original": { @@ -38,11 +44,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -73,12 +79,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { "type": "tarball", @@ -163,11 +169,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -214,16 +220,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1742827326, - "narHash": "sha256-HJdy4JgRvFojago9I0InGPkAwsJ0xv7NvVS05JygWsc=", + "lastModified": 1739778587, + "narHash": "sha256-fMt2Ao9+y71/x7zaUxzpu28M9Ugie6yl4N9lufxhc2Q=", "owner": "jhovold", "repo": "linux", - "rev": "cf34af9cea0db94254af3897c5e403364cb2eb5b", + "rev": "a2890743ed6d5cdfd2591cebf2d06af8dfd9180d", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.14", + "ref": "wip/sc8280xp-6.14-rc3", "repo": "linux", "type": "github" } @@ -239,11 +245,11 @@ ] }, "locked": { - "lastModified": 1742897527, - "narHash": "sha256-yhA9KYzOC7QLa+4pFVBrwWsjDWGvuWl9l0YVBwxw4cg=", + "lastModified": 1739291535, + "narHash": "sha256-69p2Eu/3OvKmCtuafv/yPPwsBQJjAfxThk2U+7yTGVQ=", "owner": "threefoldtech", "repo": "mycelium", - "rev": "60d8f4a9f102bf12cc4bc05fca8a252fccd10fe5", + "rev": "f420a9c0c82527ba8deb89c436f8e704bb61920c", "type": "github" }, "original": { @@ -254,11 +260,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -293,17 +299,15 @@ "inputs": { "flake-parts": "flake-parts_2", "linux-jhovold": "linux-jhovold", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" }, "locked": { - "lastModified": 1743245017, - "narHash": "sha256-zCZc3p8zD9GOKxnlghzXOZbewVKQkkEvcDO+XT+iyrY=", + "lastModified": 1739804099, + "narHash": "sha256-CK192CNcOtO0v8y0QT+vpWhlvJ8qm6vSszTBBW7Fu84=", "ref": "bump", - "rev": "f4591e4478838272ec024c2bd346001af919a79a", - "revCount": 143, + "rev": "4736fc5861dd329e0e41fde67d7cc9452470a368", + "revCount": 137, "type": "git", "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, @@ -313,6 +317,22 @@ "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" } }, + "nixpkgs": { + "locked": { + "lastModified": 1733393026, + "narHash": "sha256-hpUyV0NHnIZpFzN6p7udW6Jh+m9tlLvCcNf1/wG5pQY=", + "owner": "steveej-forks", + "repo": "nixpkgs", + "rev": "b1714b7f9e5761ad965a4df7602105f1e159b89e", + "type": "github" + }, + "original": { + "owner": "steveej-forks", + "ref": "steveej-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1733096140, @@ -327,11 +347,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { @@ -343,11 +363,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743251636, - "narHash": "sha256-ozpMykG34AT0xOYmst43eh1KTYba7QEaDzeCkPWzIP4=", + "lastModified": 1739899529, + "narHash": "sha256-+YAryDpuWmJm+xx8xAAGrN7TQoBF/3DSJvhSxFtr7us=", "owner": "steveej-forks", "repo": "nixpkgs", - "rev": "2a75dc2e69a7c3e786ebe0663613a9a7ee1c108f", + "rev": "4c624626f381e0cc1aa4e4a052dc6322342b2801", "type": "github" }, "original": { @@ -382,11 +402,11 @@ ] }, "locked": { - "lastModified": 1742243404, - "narHash": "sha256-j3jdXEU+c6xPa4zdzN2PYNsRkdlgldb1q0aBY50+AdM=", + "lastModified": 1739931434, + "narHash": "sha256-XIcisx/PG/Li6l9A0k7T1ule3yX7VCGBQmKpljbbJmU=", "owner": "youwen5", "repo": "signal-desktop-flake", - "rev": "226d1cbe55bd07d9f66bf801619a7495189e102d", + "rev": "6f0ec210e6a2a0060ad1297d9f5a0871c4aeac36", "type": "github" }, "original": { diff --git a/nix/os/devices/steveej-x13s/flake.nix b/nix/os/devices/steveej-x13s/flake.nix index e82c81d..d703881 100644 --- a/nix/os/devices/steveej-x13s/flake.nix +++ b/nix/os/devices/steveej-x13s/flake.nix @@ -28,7 +28,6 @@ ; # nixos-x13s.url = "path:/home/steveej/src/others/nixos-x13s"; # nixos-x13s.inputs.nixpkgs.follows = "nixpkgs"; - nixos-x13s.inputs.nixpkgs.follows = "nixpkgs"; ath11k-firmware = { url = "git+https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"; diff --git a/nix/pkgs/logseq/Containerfile b/nix/pkgs/logseq/Containerfile index 97464d1..339d58e 100644 --- a/nix/pkgs/logseq/Containerfile +++ b/nix/pkgs/logseq/Containerfile @@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ zip # install NodeJS & yarn -RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && apt-get update && apt-get install -y nodejs yarn