diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index 6a3dc49..8dae7b2 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -15,7 +15,7 @@ "k" = "kubectl"; "kx" = "kubectx"; "dl" = "ls -lhtr --color=always ~/Downloads | tail -n 10"; # Show the 10 newest Downloads - "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.w17.io buzzer"; + "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.cccda.de buzzer"; "beep" = "paplay /usr/share/sounds/freedesktop/stereo/complete.oga"; # play "ding" for long running jobs "dig" = "dig +short"; "cal" = "ncal -b"; diff --git a/machines/smithers/hardware-configuration.nix b/machines/smithers/hardware-configuration.nix index 77ab4d0..227f98b 100644 --- a/machines/smithers/hardware-configuration.nix +++ b/machines/smithers/hardware-configuration.nix @@ -12,6 +12,7 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + boot.kernelPackages = pkgs.linuxPackages_latest; fileSystems."/" = { device = "/dev/disk/by-uuid/91f6e726-d85d-4685-8325-d220c287e45b"; diff --git a/modules/lix.nix b/modules/lix.nix new file mode 100644 index 0000000..1c0bf80 --- /dev/null +++ b/modules/lix.nix @@ -0,0 +1,16 @@ +let + module = fetchTarball { + name = "source"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; + sha256 = "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g="; + }; + lixSrc = fetchTarball { + name = "source"; + url = "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"; + sha256 = "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0="; + }; + # This is the core of the code you need; it is an exercise to the + # reader to write the sources in a nicer way, or by using npins or + # similar pinning tools. +in +import "${module}/module.nix" { lix = lixSrc; } diff --git a/roles/all.nix b/roles/all.nix index 2c4f8db..d456d69 100644 --- a/roles/all.nix +++ b/roles/all.nix @@ -16,7 +16,6 @@ in ../modules/ssh.nix ../modules/steam.nix ../modules/via.nix - ../modules/virtualbox.nix ../modules/borgbackup.nix ../modules/udisks2.nix ../modules/samba.nix @@ -24,6 +23,7 @@ in ../modules/sway.nix ../modules/nixld.nix ../modules/fwupd.nix + ../modules/lix.nix ../secrets/remote-builder.nix ../users/fleaz.nix @@ -60,6 +60,9 @@ in # Look mum, I'm using all the new shiny stuff! nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # Enable proprietary firmware + hardware.enableAllFirmware = true; + # TMP networking.firewall = { allowedTCPPorts = [ 3000 ]; diff --git a/roles/laptop.nix b/roles/laptop.nix index 307bd2d..26ecc91 100644 --- a/roles/laptop.nix +++ b/roles/laptop.nix @@ -5,7 +5,6 @@ ../modules/networkmanager.nix ../modules/tlp.nix ../modules/sus-then-hib.nix - ../modules/k40.nix ]; } diff --git a/secrets b/secrets index b807b22..147f60a 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit b807b2260222a8d89b9606db764092eed1be891d +Subproject commit 147f60a59590e5613022cc4f912013aeea0b3a37