Compare commits
16 commits
d1a0771733
...
a549b5e22b
| Author | SHA1 | Date | |
|---|---|---|---|
| a549b5e22b | |||
| 22455cab03 | |||
| 50afd4e7c9 | |||
| 42f82df2ef | |||
| 49e03de1c4 | |||
| f251fa81a1 | |||
| d7ba491388 | |||
| 0623fda71e | |||
| 0530cb380c | |||
| 355c91e194 | |||
| ec51fe9501 | |||
| 6c062cc022 | |||
| 345e6064aa | |||
| 6b0f6519f6 | |||
| 89a9e8d507 | |||
| 31c3d5ab88 |
14 changed files with 121 additions and 132 deletions
46
flake.lock
generated
46
flake.lock
generated
|
|
@ -706,11 +706,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733363815,
|
||||
"narHash": "sha256-J2XTeJ0xQMPPo2QnPLM1ewhqCh/Okgfonr5N6Pdt7b8=",
|
||||
"lastModified": 1740852064,
|
||||
"narHash": "sha256-A2zUu1n8Bg505s/GUIYUSQFLmYJAvx/01A2OkGAkevk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "ffe6b403ba758f8a057a227de2f7235ef3dc61c0",
|
||||
"rev": "1b34da949d188b205b4132c2b726415fa19d5086",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -928,11 +928,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1713805509,
|
||||
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
|
||||
"lastModified": 1740547748,
|
||||
"narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4",
|
||||
"rev": "3a05eebede89661660945da1f151959900903b6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -990,22 +990,6 @@
|
|||
"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,
|
||||
|
|
@ -1033,22 +1017,6 @@
|
|||
"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,
|
||||
|
|
@ -1313,8 +1281,6 @@
|
|||
"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",
|
||||
|
|
|
|||
|
|
@ -81,14 +81,13 @@
|
|||
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";
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
|
||||
screen
|
||||
|
||||
inputs'.nixpkgs-kanidm.legacyPackages.kanidm
|
||||
inputs'.nixpkgs-unstable.legacyPackages.kanidm
|
||||
];
|
||||
|
||||
# Set Environment Variables
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ in
|
|||
# Password Management
|
||||
gnupg
|
||||
# yubikey-manager
|
||||
yubikey-manager-qt
|
||||
yubikey-personalization
|
||||
yubikey-personalization-gui
|
||||
|
||||
|
|
@ -245,7 +244,8 @@ in
|
|||
# libretro.snes9x2010
|
||||
# retroarchFull
|
||||
|
||||
(pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" { })
|
||||
pkgs.logseq-bin
|
||||
# (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq-bin/package.nix" { })
|
||||
])
|
||||
++ (with repoFlake.packages.${pkgs.system}; [ gimp ])
|
||||
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,12 @@
|
|||
allowInsecurePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"electron-28.3.3"
|
||||
"electron-27.3.11"
|
||||
"electron-32.3.3"
|
||||
"electron"
|
||||
];
|
||||
|
||||
permittedInsecurePackages = [
|
||||
"electron-28.3.3"
|
||||
"electron-27.3.11"
|
||||
"electron-32.3.3"
|
||||
"electron"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -45,16 +45,17 @@ 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
|
||||
]
|
||||
|
|
@ -75,7 +76,16 @@ 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"
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,6 +23,12 @@ in
|
|||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
nixpkgs-kanidm =
|
||||
# nodeFlake.inputs.nixpkgs-kanidm
|
||||
nodeFlake.inputs.nixpkgs-unstable
|
||||
;
|
||||
in
|
||||
{
|
||||
system.stateVersion = "22.05"; # Did you read the comment?
|
||||
|
||||
|
|
@ -33,7 +39,7 @@ in
|
|||
|
||||
imports = [
|
||||
"${nodeFlake.inputs.nixpkgs-unstable}/nixos/modules/services/misc/forgejo.nix"
|
||||
"${repoFlake.inputs.nixpkgs-kanidm}/nixos/modules/services/security/kanidm.nix"
|
||||
"${nixpkgs-kanidm}/nixos/modules/services/security/kanidm.nix"
|
||||
|
||||
../profiles/containers/configuration.nix
|
||||
|
||||
|
|
@ -313,6 +319,7 @@ 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" ];
|
||||
|
|
@ -389,7 +396,7 @@ in
|
|||
dataDir = "/var/lib/kanidm";
|
||||
in
|
||||
{
|
||||
package = repoFlake.inputs.nixpkgs-kanidm.legacyPackages.${pkgs.system}.kanidm;
|
||||
package = nixpkgs-kanidm.legacyPackages.${pkgs.system}.kanidm;
|
||||
|
||||
enablePam = false;
|
||||
enableClient = false;
|
||||
|
|
@ -402,7 +409,6 @@ in
|
|||
domain = "kanidm.${domain}";
|
||||
origin = "https://kanidm.${domain}";
|
||||
|
||||
db_path = "${dataDir}/db/kanidm.db";
|
||||
|
||||
bindaddress = "127.0.0.1:8444";
|
||||
|
||||
|
|
|
|||
41
nix/os/devices/sj-srv1/flake.lock
generated
41
nix/os/devices/sj-srv1/flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736373539,
|
||||
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
|
||||
"lastModified": 1742655702,
|
||||
"narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
|
||||
"rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -23,11 +23,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1739055578,
|
||||
"narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
|
||||
"lastModified": 1742937945,
|
||||
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
|
||||
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -37,13 +37,29 @@
|
|||
"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": 1739263600,
|
||||
"narHash": "sha256-f0k9Kf+kpRqieSf9nlRMLyWe5oujqSOwaNWSyfwMiIE=",
|
||||
"lastModified": 1743256265,
|
||||
"narHash": "sha256-1GJtabBAEwSkwKgSBe+osLCYwcRr5zx5H7ipuoVkO/4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9e486552fc8213d31cadd772fc883789f76199d",
|
||||
"rev": "5dab1e63b3efccf767a54b0b978b41fe7410aff0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -55,11 +71,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1739184465,
|
||||
"narHash": "sha256-7Z9kNbr6qZwPG1z/6Hn/re4SS9nu1krxyknyNeCBh/o=",
|
||||
"lastModified": 1743210622,
|
||||
"narHash": "sha256-AagCXne3DGJARB7kxCjcBgJddT/J2CC7SSe7I6kFqso=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "58edd1e2acbc9be9fe29964344c6419db013141e",
|
||||
"rev": "800863744b6d0ef3c748a094a15e7f9d361f62fb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -73,6 +89,7 @@
|
|||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-kanidm": "nixpkgs-kanidm",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
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";
|
||||
|
|
|
|||
|
|
@ -207,7 +207,8 @@ in
|
|||
parallelShutdown = 3;
|
||||
};
|
||||
|
||||
fileSystems."/mnt/8078-532D".device = "/dev/disk/by-uuid/8078-532D";
|
||||
# VM storage
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -84,6 +84,15 @@
|
|||
../../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
|
||||
|
|
|
|||
108
nix/os/devices/steveej-x13s/flake.lock
generated
108
nix/os/devices/steveej-x13s/flake.lock
generated
|
|
@ -3,11 +3,11 @@
|
|||
"ath11k-firmware": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1739552113,
|
||||
"narHash": "sha256-jO57Sqz/9BGgTfECm4Cs9yi8uFcd3YxpJjG5J7sj4Z8=",
|
||||
"lastModified": 1741293326,
|
||||
"narHash": "sha256-Ew0d2h1pHqJB8SC0pEYezU5lMknvlcYazVVYCtjW3OY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "eb147907112ebb2874426f679ed722201548cc33",
|
||||
"revCount": 167,
|
||||
"rev": "bc6359cb7ad38b7bc4de6580b7a3c70851c0cafb",
|
||||
"revCount": 173,
|
||||
"type": "git",
|
||||
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
||||
},
|
||||
|
|
@ -17,18 +17,12 @@
|
|||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"mycelium",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717951870,
|
||||
"narHash": "sha256-hGLeRxSEeFz9WvmQ4s4AuMJ5InLSZvoczDdXkWSFi1A=",
|
||||
"lastModified": 1742317686,
|
||||
"narHash": "sha256-ScJYnUykEDhYeCepoAWBbZWx2fpQ8ottyvOyGry7HqE=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "17d9e9dedd58dde2c562a4296934c6d6a0844534",
|
||||
"rev": "66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -44,11 +38,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739841949,
|
||||
"narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
|
||||
"lastModified": 1741786315,
|
||||
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
|
||||
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -79,12 +73,12 @@
|
|||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"revCount": 57,
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"revCount": 69,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -169,11 +163,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -220,16 +214,16 @@
|
|||
"linux-jhovold": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1739778587,
|
||||
"narHash": "sha256-fMt2Ao9+y71/x7zaUxzpu28M9Ugie6yl4N9lufxhc2Q=",
|
||||
"lastModified": 1742827326,
|
||||
"narHash": "sha256-HJdy4JgRvFojago9I0InGPkAwsJ0xv7NvVS05JygWsc=",
|
||||
"owner": "jhovold",
|
||||
"repo": "linux",
|
||||
"rev": "a2890743ed6d5cdfd2591cebf2d06af8dfd9180d",
|
||||
"rev": "cf34af9cea0db94254af3897c5e403364cb2eb5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jhovold",
|
||||
"ref": "wip/sc8280xp-6.14-rc3",
|
||||
"ref": "wip/sc8280xp-6.14",
|
||||
"repo": "linux",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -245,11 +239,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739291535,
|
||||
"narHash": "sha256-69p2Eu/3OvKmCtuafv/yPPwsBQJjAfxThk2U+7yTGVQ=",
|
||||
"lastModified": 1742897527,
|
||||
"narHash": "sha256-yhA9KYzOC7QLa+4pFVBrwWsjDWGvuWl9l0YVBwxw4cg=",
|
||||
"owner": "threefoldtech",
|
||||
"repo": "mycelium",
|
||||
"rev": "f420a9c0c82527ba8deb89c436f8e704bb61920c",
|
||||
"rev": "60d8f4a9f102bf12cc4bc05fca8a252fccd10fe5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -260,11 +254,11 @@
|
|||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1710156097,
|
||||
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
|
||||
"lastModified": 1731533336,
|
||||
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
|
||||
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -299,15 +293,17 @@
|
|||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"linux-jhovold": "linux-jhovold",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"x13s-bt-linux-firmware": "x13s-bt-linux-firmware"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739804099,
|
||||
"narHash": "sha256-CK192CNcOtO0v8y0QT+vpWhlvJ8qm6vSszTBBW7Fu84=",
|
||||
"lastModified": 1743245017,
|
||||
"narHash": "sha256-zCZc3p8zD9GOKxnlghzXOZbewVKQkkEvcDO+XT+iyrY=",
|
||||
"ref": "bump",
|
||||
"rev": "4736fc5861dd329e0e41fde67d7cc9452470a368",
|
||||
"revCount": 137,
|
||||
"rev": "f4591e4478838272ec024c2bd346001af919a79a",
|
||||
"revCount": 143,
|
||||
"type": "git",
|
||||
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
|
||||
},
|
||||
|
|
@ -317,22 +313,6 @@
|
|||
"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,
|
||||
|
|
@ -347,11 +327,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1739758141,
|
||||
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
|
||||
"lastModified": 1742937945,
|
||||
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c618e28f70257593de75a7044438efc1c1fc0791",
|
||||
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -363,11 +343,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1739899529,
|
||||
"narHash": "sha256-+YAryDpuWmJm+xx8xAAGrN7TQoBF/3DSJvhSxFtr7us=",
|
||||
"lastModified": 1743251636,
|
||||
"narHash": "sha256-ozpMykG34AT0xOYmst43eh1KTYba7QEaDzeCkPWzIP4=",
|
||||
"owner": "steveej-forks",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c624626f381e0cc1aa4e4a052dc6322342b2801",
|
||||
"rev": "2a75dc2e69a7c3e786ebe0663613a9a7ee1c108f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -402,11 +382,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739931434,
|
||||
"narHash": "sha256-XIcisx/PG/Li6l9A0k7T1ule3yX7VCGBQmKpljbbJmU=",
|
||||
"lastModified": 1742243404,
|
||||
"narHash": "sha256-j3jdXEU+c6xPa4zdzN2PYNsRkdlgldb1q0aBY50+AdM=",
|
||||
"owner": "youwen5",
|
||||
"repo": "signal-desktop-flake",
|
||||
"rev": "6f0ec210e6a2a0060ad1297d9f5a0871c4aeac36",
|
||||
"rev": "226d1cbe55bd07d9f66bf801619a7495189e102d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
;
|
||||
# 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";
|
||||
|
|
|
|||
|
|
@ -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_18.x | bash -
|
||||
RUN curl -sL https://deb.nodesource.com/setup_20.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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue