From cb788261448f0cc1aff6bf6505f5b6bcd7a17531 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 10 Feb 2022 18:13:41 -0800
Subject: nix: fix a bunch of stuff

---
 hosts/carmel/configuration.nix | 44 ------------------------------------------
 hosts/carmel/default.nix       | 43 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 44 deletions(-)
 delete mode 100644 hosts/carmel/configuration.nix
 create mode 100644 hosts/carmel/default.nix

(limited to 'hosts/carmel')

diff --git a/hosts/carmel/configuration.nix b/hosts/carmel/configuration.nix
deleted file mode 100644
index d009831..0000000
--- a/hosts/carmel/configuration.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../../modules/systems
-      ../../modules/desktop
-    ];
-
-  nix = {
-    package = pkgs.nixUnstable;
-  };
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  time.timeZone = "America/Los_Angeles";
-
-  networking.hostName = "carmel"; # Define your hostname.
-
-  networking.wireless.enable = false;
-  networking.interfaces.enp9s0.useDHCP = true;
-  networking.interfaces.wlp8s0.useDHCP = true;
-  # TODO: If set to false, systemd hangs on boot, unclear why.
-
-  services.xserver.dpi = 168;
-
-  # Use systemd-resolved
-  services.resolved = {
-    enable = true;
-    dnssec = "false";
-  };
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "21.11"; # Did you read the comment?
-}
-
diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix
new file mode 100644
index 0000000..19c88c0
--- /dev/null
+++ b/hosts/carmel/default.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ../../modules/desktop
+    ];
+
+  nix = {
+    package = pkgs.nixUnstable;
+  };
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  time.timeZone = "America/Los_Angeles";
+
+  networking.hostName = "carmel"; # Define your hostname.
+
+  networking.wireless.enable = false;
+  networking.interfaces.enp9s0.useDHCP = true;
+  networking.interfaces.wlp8s0.useDHCP = true;
+  # TODO: If set to false, systemd hangs on boot, unclear why.
+
+  services.xserver.dpi = 168;
+
+  # Use systemd-resolved
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "21.11"; # Did you read the comment?
+}
+
-- 
cgit 1.4.1