From de0a20bf73d5324e3610a1e1bbc4f8eb246a7de0 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Fri, 1 Nov 2024 23:57:48 +0100 Subject: [PATCH] adds experimental flake per host settings --- bin/actions/update.sh | 4 ++-- config/nixos/configuration.nix | 1 - config/nixos/flake.nix | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 config/nixos/flake.nix diff --git a/bin/actions/update.sh b/bin/actions/update.sh index 067bb18..98f3f3f 100755 --- a/bin/actions/update.sh +++ b/bin/actions/update.sh @@ -104,7 +104,7 @@ sys_packages() { brew cleanup else if [ -x "$(command -v nixos-version)" ]; then - sudo nixos-rebuild switch + cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --flake .#$DOTF_HOSTNAME # Exit if this failed if [ $? -ne 0 ]; then @@ -211,7 +211,7 @@ git_repos() { } homemanager() { - cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch + cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup } ensure_homemanager_installed() { diff --git a/config/nixos/configuration.nix b/config/nixos/configuration.nix index 95bf183..bb1e0ad 100644 --- a/config/nixos/configuration.nix +++ b/config/nixos/configuration.nix @@ -4,7 +4,6 @@ # Include the results of the hardware scan. /etc/nixos/hardware-configuration.nix ./packages/default.nix - ./nvidia.nix ./virtualization.nix ./users.nix ./flatpak.nix diff --git a/config/nixos/flake.nix b/config/nixos/flake.nix new file mode 100644 index 0000000..c29c5c1 --- /dev/null +++ b/config/nixos/flake.nix @@ -0,0 +1,29 @@ +{ + description = "menno's dotfiles"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05"; + }; + + outputs = + { self, nixpkgs }: + { + nixosConfigurations = { + "mennos-laptop" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./configuration.nix + ./nvidia.nix + { networking.hostName = "mennos-laptop"; } + ]; + }; + "mennos-gamingpc" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./configuration.nix + { networking.hostName = "mennos-desktop"; } + ]; + }; + }; + }; +}