ar
/
nibylandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake: updates & local fixes

main
Robert Gerus 2023-10-29 16:26:25 +01:00 committed by Ari Gato
parent 0b4af260ef
commit 3aa491f2cf
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
flake.lock
View File

@ -301,11 +301,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1698250431, "lastModified": 1698479159,
"narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1698100456, "lastModified": 1698582829,
"narHash": "sha256-Hx9ZVZYARVbzJB0fFNe/lPE9a4oP1dDGJnl3siRtBJ0=", "narHash": "sha256-C+KgImlMD/39AlRtHr9KXEmhmAWrSMZmn/cagOgARQk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "bb380e19488ec6105d07b57c23ac518be51bf901", "rev": "a5e89456fc931d89917eb1818371762481fead9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -361,11 +361,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1697662468, "lastModified": 1698504395,
"narHash": "sha256-BAryFkJiF8x9s76QDDdmR8l7ocAsBVa1z6p/pIPcdy4=", "narHash": "sha256-92+0zv8p0awLLigXNFHsuNBYzeOuBqMqPqLTbmHWRCA=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "cd3a9cd0fcd30b55b9950ddcaec2d5271c0b78df", "rev": "dfe2d3db94e4829e317f97e3a095d6fd8b91f30c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -418,11 +418,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1697946153, "lastModified": 1698550809,
"narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=", "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d", "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -574,11 +574,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1697723726, "lastModified": 1698318101,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,16 +590,16 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1698250025, "lastModified": 1698592573,
"narHash": "sha256-hABB/LMeUBou2OboDWf+TOjrDtwPRgurIlG6l++r3Qs=", "narHash": "sha256-foL5v67lXpYsAVpMJzfXseZCkJbQoUxGmJyoBWyc8lQ=",
"owner": "arachnist", "owner": "arachnist",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c538ad4e7352e13ea25c4652198fe0aedcbc8caf", "rev": "6f4f1090acd9e271a020bbac7d8abd3a1652478b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "arachnist", "owner": "arachnist",
"ref": "klipper-firmwares-package-overrides", "ref": "ar-patchset-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View File

@ -5,7 +5,7 @@
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs.url = "git+file:/home/ar/scm/nixpkgs"; # nixpkgs.url = "git+file:/home/ar/scm/nixpkgs";
nixpkgs.url = nixpkgs.url =
"github:arachnist/nixpkgs/klipper-firmwares-package-overrides"; "github:arachnist/nixpkgs/ar-patchset-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack"; nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";

10
modules/graphical.nix
View File

@ -111,10 +111,10 @@
hyprland.enable = true; hyprland.enable = true;
firefox = { firefox = {
enable = true; enable = true;
nativeMessagingHosts.packages = with pkgs; [ #nativeMessagingHosts.packages = with pkgs; [
browserpass # browserpass
plasma-browser-integration # plasma-browser-integration
]; #];
}; };
}; };
@ -124,7 +124,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
chromium chromium
electrum # electrum
ffmpeg-full ffmpeg-full
firefox firefox
imagemagick imagemagick

4
nixos/akamanto/default.nix
View File

@ -112,7 +112,7 @@ in {
gcc-arm-embedded = pkgs.gcc-arm-embedded-11; gcc-arm-embedded = pkgs.gcc-arm-embedded-11;
}; };
}; };
host = { rpi = {
enable = true; enable = true;
configFile = ./klipper-rpi.cfg; configFile = ./klipper-rpi.cfg;
serial = "/run/klipper/host-mcu"; serial = "/run/klipper/host-mcu";
@ -141,7 +141,7 @@ in {
max_z_velocity = "5"; max_z_velocity = "5";
}; };
mcu = { serial = "/dev/ttyACM0"; }; mcu = { serial = "/dev/ttyACM0"; };
host = { serial = "/run/klipper/host-mcu"; }; "mcu rpi" = { serial = "/run/klipper/host-mcu"; };
virtual_sdcard = { path = "/var/lib/moonraker/gcodes"; }; virtual_sdcard = { path = "/var/lib/moonraker/gcodes"; };
pause_resume = { }; pause_resume = { };