diff --git a/ctl.sh b/ctl.sh index 00e007d..5682f74 100755 --- a/ctl.sh +++ b/ctl.sh @@ -48,7 +48,7 @@ function os { } function rebuild { echo "Rebuild OS config: ${1}" - sudo nixos-rebuild --flake ./os#${1} switch + sudo nixos-rebuild --flake ./os#${1} switch --impure } function upgrade { echo "Upgrade channels and rebuild ${1}" diff --git a/os/hardware/lenovo-thinkpad-e14.nix b/os/hardware/lenovo-thinkpad-e14.nix index 37e177e..4dc1821 100644 --- a/os/hardware/lenovo-thinkpad-e14.nix +++ b/os/hardware/lenovo-thinkpad-e14.nix @@ -12,6 +12,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; + boot.kernelParams = [ "modprobe.blacklist=dvb_usb_rtl28xxu" ]; boot.extraModulePackages = [ ]; fileSystems."/" = @@ -43,4 +44,5 @@ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.bluetooth.enable = true; hardware.ledger.enable = true; + hardware.rtl-sdr.enable = true; } diff --git a/os/system/packages.nix b/os/system/packages.nix index 6ddc90c..1d81cb2 100644 --- a/os/system/packages.nix +++ b/os/system/packages.nix @@ -1,4 +1,10 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: +let + unstable = import + (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/nixpkgs-unstable) + # reuse the current configuration + { config = config.nixpkgs.config; }; +in { nixpkgs.config = { allowUnfree = true; @@ -19,6 +25,7 @@ enableSSHSupport = true; }; + environment.systemPackages = with pkgs; [ fd fzf @@ -40,7 +47,12 @@ docker-buildx appimage-run gimp + unstable.libation + unstable.ledger-live-desktop + unstable.android-tools + unstable.android-udev-rules ]; + services.logind.extraConfig = '' RuntimeDirectorySize=20G ''; diff --git a/os/users/master.nix b/os/users/master.nix index 49542a1..4ad518e 100644 --- a/os/users/master.nix +++ b/os/users/master.nix @@ -4,7 +4,7 @@ isNormalUser = true; description = "master"; initialPassword = "master"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = [ "networkmanager" "wheel" "docker" "plugdev" ]; }; home-manager.users.master = { @@ -37,9 +37,10 @@ hunspell hunspellDicts.de_CH imagemagick - ledger-live-desktop solana-cli sqlite + rtl-sdr + brave ]; programs = {