don't enable fwupd in the iso

This commit is contained in:
Rouven Seifert 2023-05-23 20:51:02 +02:00
parent 29c53ffa92
commit e04491f9dd
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
6 changed files with 13 additions and 16 deletions

View file

@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684741999, "lastModified": 1684824189,
"narHash": "sha256-KZLKsFZ6cLjCdCNKZoT8bc1y+rYBuFgKatmIB38zqy4=", "narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ba006d7cca2cb871c6a31bdbc130c05cde5ca8e8", "rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1684750687, "lastModified": 1684844798,
"narHash": "sha256-lqFY4fLfx17l4lFBCe0nQdNAexxkqut90Y2cBOc2gbo=", "narHash": "sha256-ZrMXFoEA535jOZ+eDA3s+URZ5MkVRksBgL5qGnb6Ciw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "ad244190e001de3eded047a5a387ea47fa0b3eea", "rev": "eb1f832fcec5838053c6b031b656e4f949ada57b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684662198, "lastModified": 1684754342,
"narHash": "sha256-lmGDGuFONWSoGBKDDhU/6fOhhmFoZQ8rPf+kS7/e/Gs=", "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50a183182d7ae39133555414d48d5d609a28a57d", "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -49,7 +49,7 @@
}@attrs: { }@attrs: {
packages.x86_64-linux.iso = self.nixosConfigurations.iso.config.system.build.isoImage; packages.x86_64-linux.iso = self.nixosConfigurations.iso.config.system.build.isoImage;
packages.x86_64-linux.jmri = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/jmri { }; packages.x86_64-linux.jmri = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/jmri { };
# packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { }; packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { };
hydraJobs = self.packages; hydraJobs = self.packages;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {

View file

@ -10,7 +10,6 @@
keyMap = "dvorak"; keyMap = "dvorak";
}; };
programs.git.enable = true; programs.git.enable = true;
services.fwupd.enable = true;
# in case we need to rescue a zfs machine # in case we need to rescue a zfs machine
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;

View file

@ -169,6 +169,8 @@
killall killall
zip zip
unzip unzip
virt-viewer # multi monitor for vms
]; ];
programs.java.enable = true; programs.java.enable = true;

View file

@ -1,9 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
# nodejs 16 is EOL but bitwarden depends on it
nixpkgs.config.permittedInsecurePackages = [
"nodejs-16.20.0"
];
# fixes pam entries for swaylock # fixes pam entries for swaylock
security.pam.services.swaylock.text = '' security.pam.services.swaylock.text = ''
# Account management. # Account management.

View file

@ -31,7 +31,7 @@
gomuks # alternative matrix client gomuks # alternative matrix client
# games # games
# prismlauncher # minecraft, but it actually works # not anymore lol prismlauncher # minecraft, but it actually works # not anymore lol
superTuxKart superTuxKart
# yubikey and password stuff # yubikey and password stuff