Compare commits
2 commits
9df07c3d32
...
11eac4d47f
Author | SHA1 | Date | |
---|---|---|---|
11eac4d47f | |||
153929a309 |
6 changed files with 81 additions and 71 deletions
136
flake.lock
generated
136
flake.lock
generated
|
@ -8,11 +8,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736955230,
|
||||
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
|
||||
"lastModified": 1745630506,
|
||||
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
|
||||
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -51,11 +51,11 @@
|
|||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745523430,
|
||||
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
|
||||
"lastModified": 1746562888,
|
||||
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
|
||||
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -142,11 +142,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700795494,
|
||||
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
|
||||
"lastModified": 1744478979,
|
||||
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
|
||||
"rev": "43975d782b418ebf4969e9ccba82466728c2851b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -163,11 +163,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744478979,
|
||||
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
|
||||
"lastModified": 1747365160,
|
||||
"narHash": "sha256-4ZVr0x+ry6ybym/VhVYACj0HlJo44YxAaPGOxiS88Hg=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "43975d782b418ebf4969e9ccba82466728c2851b",
|
||||
"rev": "8817b00b0011750381d0d44bb94d61087349b6ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -183,11 +183,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738140586,
|
||||
"narHash": "sha256-Vn4PD4eH18QklgDY1vnjXJqNPmP3SJNejcBroW0yTTA=",
|
||||
"lastModified": 1746690306,
|
||||
"narHash": "sha256-bMp4BCrTOX7VDLVU8TzMSQj1hviBrARz9iiqNq6Vbnk=",
|
||||
"owner": "mirrexagon",
|
||||
"repo": "nixpkgs-esp-dev",
|
||||
"rev": "29517b39abe729e04118bf77af526f9947f6c476",
|
||||
"rev": "6c34f2436015eb6c107970d9b88f3d5d4600c6fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -484,11 +484,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703113217,
|
||||
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
|
||||
"lastModified": 1745494811,
|
||||
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
|
||||
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -504,11 +504,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745593878,
|
||||
"narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=",
|
||||
"lastModified": 1747374689,
|
||||
"narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a",
|
||||
"rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -526,11 +526,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745439012,
|
||||
"narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=",
|
||||
"lastModified": 1747279714,
|
||||
"narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8",
|
||||
"rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -548,11 +548,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745593741,
|
||||
"narHash": "sha256-ZV/HgXi9P9HbQqVpdmmUK+szW9Sk6jDyWOACfOYEJNs=",
|
||||
"lastModified": 1747347117,
|
||||
"narHash": "sha256-wsPOuwczt+kJ4vuf3mm6uMv4wnfWP/RNV5Cp/P5nqQw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "5ca168f6f2dfda3aa047386de6d8733fcddff1bd",
|
||||
"revCount": 17793,
|
||||
"rev": "3f355b8fd1ffbe670d756bcf976a38cbe80bb77b",
|
||||
"revCount": 17891,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
@ -591,11 +591,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745596313,
|
||||
"narHash": "sha256-O2LDLX2F3lnOAMikTufR9NvaXbbg5KzjlwRLMcA3vzE=",
|
||||
"lastModified": 1747304844,
|
||||
"narHash": "sha256-aLS9HqdtAtioT2JJSWQ7cgWKozBmCtxzYWIEZb1RzkA=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "927e9f1e05ceeacdc66e9b23f92a7ccfec8a130a",
|
||||
"rev": "b8326b5bfb204d7b57802a218de1ebbb743bf8dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -624,11 +624,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1745592977,
|
||||
"narHash": "sha256-XhfYYefs/97yWcyNKEarStaSL4t4M+yR6ZD4PQbO5Lo=",
|
||||
"lastModified": 1747289333,
|
||||
"narHash": "sha256-S2xNTAo0e87rK+sNDQCxOsBKtQEBAAVwgkzdpnWoQC0=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "501ea471283a3ac7b94593e271c9d4ae6af8859f",
|
||||
"rev": "46a8f81160708d05e9609c318cce64e3e5ac2538",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -720,11 +720,11 @@
|
|||
},
|
||||
"nix-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1745503349,
|
||||
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
|
||||
"lastModified": 1747129300,
|
||||
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
|
||||
"rev": "e81fd167b33121269149c57806599045fd33eeed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -779,11 +779,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1745503349,
|
||||
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
|
||||
"lastModified": 1747129300,
|
||||
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
|
||||
"rev": "e81fd167b33121269149c57806599045fd33eeed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -793,11 +793,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1703013332,
|
||||
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
|
||||
"lastModified": 1745391562,
|
||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
|
||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -873,11 +873,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1745487689,
|
||||
"narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
|
||||
"lastModified": 1747209494,
|
||||
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
|
||||
"rev": "5d736263df906c5da72ab0f372427814de2f52f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -936,11 +936,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1745391562,
|
||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -952,11 +952,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1745391562,
|
||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -983,10 +983,10 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"path": "/nix/store/4m21g6b3bq78vn5skaxjmqwg7fnir87j-source",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"lastModified": 1745391562,
|
||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
||||
"path": "/nix/store/2ab9ljvsgkmn3zizflwf61207a23q6q1-source",
|
||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1058,11 +1058,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745459908,
|
||||
"narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
|
||||
"lastModified": 1746056780,
|
||||
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
|
||||
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1189,11 +1189,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745618823,
|
||||
"narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=",
|
||||
"lastModified": 1747365543,
|
||||
"narHash": "sha256-r5HRe9CRFe6qvy7KLkTX9WySTqkNmvlobTR8g5AHLHA=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "11ceb2fde1901dc227421bbbef2d0800339f5126",
|
||||
"rev": "7566bc015064ed3eb50b436f2225ddab06132beb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1300,11 +1300,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720064283,
|
||||
"narHash": "sha256-/C+A08rgPQ+R2SJwaGNpt/rQ0xa6cbyWHqw3nB1caxI=",
|
||||
"lastModified": 1746431176,
|
||||
"narHash": "sha256-bwXLFy2pDpNE60EkVltrmiRgwNWLo4eYBesP997p8mg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "talon-nix",
|
||||
"rev": "718a82d3f45fa875f00f61867d6ed9285e40ce59",
|
||||
"rev": "cc110629c5f0be12e839b2aea6a16880f1822706",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1456,11 +1456,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1745372360,
|
||||
"narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=",
|
||||
"lastModified": 1747111562,
|
||||
"narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "c31679aa41966ee9272bb240703755cb1e7c72e3",
|
||||
"rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -153,7 +153,6 @@
|
|||
|
||||
# Modules for Linux machines with Wayland GUIs.
|
||||
linuxGuiModuleSet = [
|
||||
waveforms.nixosModule
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
|
||||
./nixos/dotfiles/vscode.nix
|
||||
|
@ -223,6 +222,7 @@
|
|||
esp-dev = esp-dev.outputs.packages.${system};
|
||||
lix = lix.outputs.packages.${system};
|
||||
talon = talon.outputs.packages.${system};
|
||||
waveforms = waveforms.outputs.packages.${system};
|
||||
|
||||
# Helper to convert hm modules into NixOS or nix-on-droid modules.
|
||||
callHm = module: (specialArgs: (import module) specialArgs);
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
# vim: et:ts=2:sw=2:
|
||||
#
|
||||
{ deprekages, pkgs, ... }:
|
||||
{ deprekages, pkgs, waveforms, ... }:
|
||||
{
|
||||
services.udev = {
|
||||
|
||||
|
@ -23,6 +23,10 @@
|
|||
# If we have a Apple T2 VHCI, force it to re-start once things are more up.
|
||||
# This forces a re-enumeration of the connected devices, and thus makes things like the touch bar work reliably.
|
||||
ACTION=="add", SUBSYSTEM=="usb", ATTR{serial}=="bce-vhci", ATTR{authorized}=="1", ATTR{authorized}="0", ATTR{authorized}="1"
|
||||
|
||||
# Digilent waveforms
|
||||
ACTION=="add", ATTR{idVendor}=="1443", GROUP="plugdev", TAG+="uaccess"
|
||||
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", GROUP="plugdev", TAG+="uaccess", RUN+="${waveforms.adept2-runtime}/sbin/dftdrvdtch %s{busnum} %s{devnum}"
|
||||
'';
|
||||
|
||||
};
|
||||
|
|
|
@ -92,6 +92,7 @@
|
|||
#
|
||||
services.pcscd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
services.mullvad-vpn.enable = true;
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
services.udev.packages = [
|
||||
|
|
|
@ -199,6 +199,9 @@ with pkgs;
|
|||
evtest
|
||||
libinput
|
||||
|
||||
# Networking
|
||||
mullvad-vpn
|
||||
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
pkgs,
|
||||
deprekages,
|
||||
niri,
|
||||
waveforms,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -61,7 +62,7 @@ with pkgs;
|
|||
krita
|
||||
xournalpp
|
||||
kdePackages.itinerary
|
||||
deprekages.notion-app
|
||||
#deprekages.notion-app
|
||||
|
||||
# PDFs.
|
||||
(zathuraPkgs.override { useMupdf = false; }).zathuraWrapper
|
||||
|
@ -137,6 +138,7 @@ with pkgs;
|
|||
imhex
|
||||
gimp
|
||||
deluge
|
||||
waveforms.waveforms
|
||||
|
||||
# System utilities.
|
||||
nemo-with-extensions
|
||||
|
|
Loading…
Add table
Reference in a new issue