artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add logic analyzer tools, update nixpkgs and fix stuff

Browse source
This commit is contained in:
Artemis Tosini 2023-09-22 02:15:29 +00:00
parent 6879b0212c
commit 087223f8a9
Signed by: artemist
GPG key ID: EE5227935FE3FF18
6 changed files with 46 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
externals/packages/fujproj/default.nix vendored
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libusb1, libftdi1 }: { stdenv, lib, fetchFromGitHub, cmake, pkg-config, libusb1, libftdi1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fujprog"; pname = "fujprog";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libftdi1 libusb1 ]; buildInputs = [ libftdi1 libusb1 ];
meta = with lib; { meta = with lib; {

172
flake.lock
View file

@ -113,60 +113,6 @@
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1692799911,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1692799911,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@ -183,7 +129,9 @@
}, },
"fonts": { "fonts": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": [
"utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -253,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694642908, "lastModified": 1695224363,
"narHash": "sha256-0Opzs/56VW03COlVdoBrHJZGxQ7gzLDEWADnccC8ras=", "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b62f549653e97d78392c1e282b8ca76546a86585", "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,7 +219,9 @@
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_2", "flake-utils": [
"utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -295,11 +245,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1694591211, "lastModified": 1695109627,
"narHash": "sha256-NPP7XGZH+Q5ey7nE2zGLrBrzKmLYPhj8YgsTSdhH0D4=", "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3ccd87fcdae4732fe33773cefa4375c641a057e7", "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +260,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694422566, "lastModified": 1695145219,
"narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,18 +309,20 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"beautysh": "beautysh", "beautysh": "beautysh",
"flake-utils": "flake-utils_3", "flake-utils": [
"utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1694341786, "lastModified": 1695300485,
"narHash": "sha256-7xp0lZ0Ihx1f9WLYxOWP73PlM0HOa0Wrp3/iF7D++zc=", "narHash": "sha256-lPxXM584q9AVdUZxbEJgIPVeg39X6GWIENuENRxyHqo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "9e6892e8391a5bcc3727802b6a9fb2b9b52537df", "rev": "32a64af2318beac3c89d4d1fa0b73ce237c5cf1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,7 +361,7 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -418,11 +370,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1692274144, "lastModified": 1694364351,
"narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,7 +440,7 @@
"nixvim": "nixvim", "nixvim": "nixvim",
"private": "private", "private": "private",
"rustybar": "rustybar", "rustybar": "rustybar",
"utils": "utils_3", "utils": "utils_2",
"wip-pinebook-pro": "wip-pinebook-pro" "wip-pinebook-pro": "wip-pinebook-pro"
} }
}, },
@ -522,14 +474,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_2" "utils": [
"utils"
]
}, },
"locked": { "locked": {
"lastModified": 1637380210, "lastModified": 1695347458,
"narHash": "sha256-aUpCO7JeSlhG2ydZucnzHTQdCd849u1EzTgIqTjpJV4=", "narHash": "sha256-eK5Jlzq5X2R4hSZEcY6oXX35yCyanSRB/EApBDULYjU=",
"owner": "mildlyfunctionalgays", "owner": "mildlyfunctionalgays",
"repo": "rustybar", "repo": "rustybar",
"rev": "c21016e81ad2b460e05d1049cd15aafeac6f5dc9", "rev": "33be10885773f1e33f77e95e551aab1a370410dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,51 +522,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"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"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1678901627, "lastModified": 1678901627,
@ -629,23 +538,8 @@
} }
}, },
"utils_2": { "utils_2": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,

13
flake.nix
View file

@ -1,37 +1,34 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
fonts = { fonts = {
url = "github:artemist/fonts"; url = "github:artemist/fonts";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "utils";
}; };
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote/v0.3.0"; url = "github:nix-community/lanzaboote/v0.3.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "utils";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "utils";
}; };
rustybar = { rustybar = {
url = "github:mildlyfunctionalgays/rustybar"; url = "github:mildlyfunctionalgays/rustybar";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "utils";
}; };
private.url = private.url =
"git+ssh://git@github.com/artemist/nixos-config-private?ref=unified"; "git+ssh://git@github.com/artemist/nixos-config-private?ref=unified";
wip-pinebook-pro = { wip-pinebook-pro = {
url = "github:samueldr/wip-pinebook-pro"; url = "github:samueldr/wip-pinebook-pro";
flake = false; flake = false;

6
sets/hardware.nix
View file

@ -4,18 +4,20 @@ in {
services.udev.packages = [ services.udev.packages = [
(pkgs.callPackage ../externals/rules/adafruit.nix { }) (pkgs.callPackage ../externals/rules/adafruit.nix { })
(pkgs.callPackage ../externals/rules/limesuite.nix { }) (pkgs.callPackage ../externals/rules/limesuite.nix { })
pkgs.libsigrok
pkgs.openocd pkgs.openocd
pkgs.platformio pkgs.platformio
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
jlink
kicad kicad
openocd openocd
picocom picocom
stlink
jlink
platformio platformio
proxmark3-rrg proxmark3-rrg
pulseview
stlink
]; ];
users = { users = {

1
sets/packages.nix
View file

@ -60,6 +60,7 @@
pciutils pciutils
pdftk pdftk
poppler_utils poppler_utils
python3Packages.ipython
ripgrep ripgrep
rlwrap rlwrap
tmux tmux

2
sets/virtualization.nix
View file

@ -22,7 +22,7 @@
# Breaks IPv4 on bridge # Breaks IPv4 on bridge
boot.kernel.sysctl."net.bridge.bridge-nf-call-iptables" = 0; boot.kernel.sysctl."net.bridge.bridge-nf-call-iptables" = 0;
environment.systemPackages = with pkgs; [ virtmanager spice-gtk qemu ]; environment.systemPackages = with pkgs; [ virt-manager spice-gtk qemu ];
users.users = { users.users = {
artemis.extraGroups = [ "lxd" "libvirtd" ]; artemis.extraGroups = [ "lxd" "libvirtd" ];