From 596e43fcb81ab4504b7e2e1ec430e8484260a437 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:01:14 +0100 Subject: [PATCH] Small fixes to allow unfree --- home-manager/queen-Lillian.nix | 27 ++++++++++++++++++++++ nixos/queen/configuration.nix | 31 ++++++++++++++++++++++++++ nixos/queen/hardware-configuration.nix | 1 + 3 files changed, 59 insertions(+) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 708c277..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -21,6 +21,33 @@ ./program-configs/zsh.nix ]; + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c7ac220..37e0283 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,6 +18,32 @@ ./hardware-configuration.nix ./nextcloud.nix ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + nix = { gc = { automatic = true; @@ -111,6 +137,11 @@ networking.hostName = "queen"; + #TODO: see if this bootloader works on the vps and if not replace it! + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.05"; } diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index a91384e..4097208 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,6 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +#TODO: REPLACE THIS, THIS IS PLACEHOLDER COPY FROM GLaDOS!!! { config, lib,