summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2023-08-30 23:40:10 +0200
committerDevin Finlinson <devin.finlinson@pm.me>2023-08-30 23:40:10 +0200
commit06f52643745f49c9359b597f09db35df7f47791e (patch)
tree1683d60f80746ba2a49aadb6a5c5f83cafe10267
parentb543fe9a7714686c7c8e2ff35895de6fa558be53 (diff)
-rw-r--r--flake.nix11
-rw-r--r--machines/zenbook/configuration.nix16
-rw-r--r--modules/nix-common.nix9
3 files changed, 8 insertions, 28 deletions
diff --git a/flake.nix b/flake.nix
index 71c4bc5..c4771dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,19 +13,9 @@
# outputs = { self, nixpkgs }: {
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: let
-
- system = "x86_64-linux";
defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem {
# defFlakeSystem = nixpkgs.lib.nixosSystem {
- pkgs = import nixpkgs {
- inherit system;
- config.allowUnfree = true;
- };
- unstable = import nixpkgs-unstable {
- inherit system;
- config.allowUnfree = true;
- };
modules = [({ ... }: {
imports = [
baseCfg
@@ -47,7 +37,6 @@
nixosConfigurations = {
zenbook = defFlakeSystem {
- inherit system;
modules = [
./machines/zenbook/configuration.nix
diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix
index 827b59e..81e3317 100644
--- a/machines/zenbook/configuration.nix
+++ b/machines/zenbook/configuration.nix
@@ -5,22 +5,18 @@
{ config, ... }:
{
- # imports =
- # [ # Include the results of the hardware scan.
- # ./hardware-configuration.nix
- # ./services.nix
- # ./system-packages.nix
- # ./sway.nix
- # ./home-manager/home.nix
- # ./hyprland.nix
- # ];
-
# Use the systemd-boot EFI boot loader.
boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
+ nixpkgs = {
+ # texlive.combined.scheme-medium;
+ hostPlatform = "x84_64";
+ config.allowUnfree = true;
+ }
+
networking = {
firewall = {
# Open ports in the firewall.
diff --git a/modules/nix-common.nix b/modules/nix-common.nix
index 874e2d6..6e4d373 100644
--- a/modules/nix-common.nix
+++ b/modules/nix-common.nix
@@ -1,10 +1,5 @@
{ config, pkgs, ... }: {
- nixpkgs = {
- # texlive.combined.scheme-medium;
- config.allowUnfree = true;
- };
-
nix = {
settings = {
allowed-users = [ "@wheel" "@builders" "@video" ];
@@ -13,8 +8,8 @@
# Clean up old generations after 30 days
gc = {
- # automatic = true;
- # dates = "weekly";
+ automatic = true;
+ dates = "weekly";
options = "--delete-older-than 30d";
};