nix #11

Manually merged
geoffrey merged 113 commits from nix into main 2023-12-09 21:43:01 +01:00
5 changed files with 6 additions and 5 deletions
Showing only changes of commit 7e49ed2e19 - Show all commits

View file

@ -3,7 +3,6 @@
# TODO Surely there's more elegant? # TODO Surely there's more elegant?
nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs
# Below probably only needed on non-NixOS
nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
# First commit before 23.05 release date:
nix-channel --add https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz nixos-hardware
nix-channel --update nix-channel --update

View file

@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
<nixos-hardware/dell/g3/3779> "${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/dell/g3/3779"
./os/loader.nix ./os/loader.nix
]; ];

View file

@ -1,7 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
<home-manager/nixos> "${builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"}/nixos"
]; ];
users.users.geoffrey = { users.users.geoffrey = {

View file

@ -7,5 +7,6 @@
./common.nix ./common.nix
./desktop.nix ./desktop.nix
./wireless.nix ./wireless.nix
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"}/module.nix"
]; ];
} }

View file

@ -1,7 +1,8 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
<nixos-hardware/pine64/pinebook-pro> # First commit before 23.05 release date:
"${builtins.fetchTarball "https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz"}/pine64/pinebook-pro"
./os/loader.nix ./os/loader.nix
]; ];
# nixos-hardware use latest kernel by default. This obviously runs quickly out of sync with zfs packages. # nixos-hardware use latest kernel by default. This obviously runs quickly out of sync with zfs packages.