From 92c466c2472a774552d5522e2b7fc2af29349814 Mon Sep 17 00:00:00 2001 From: mehbark Date: Mon, 14 Aug 2023 20:26:55 -0400 Subject: [PATCH] enable cachix, work towards wayland --- .gitignore | 3 +++ configuration.nix | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd791b..faabe12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ result/ +result +flake.lock +*.qcow2 diff --git a/configuration.nix b/configuration.nix index 7850de0..92056cc 100644 --- a/configuration.nix +++ b/configuration.nix @@ -3,13 +3,19 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, ... }: - +let + use-x11 = true; +in { nix = { package = pkgs.nixFlakes; extraOptions = '' experimental-features = nix-command flakes ''; + settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; }; imports = @@ -51,11 +57,11 @@ }; # Enable the X11 windowing system. - services.xserver.enable = true; + services.xserver.enable = use-x11; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.sddm.enable = use-x11; + services.xserver.desktopManager.plasma5.enable = use-x11; # Configure keymap in X11 services.xserver = { @@ -63,6 +69,8 @@ xkbVariant = ""; }; + programs.hyprland.enable = !use-x11; + # Enable CUPS to print documents. services.printing.enable = true; @@ -127,6 +135,7 @@ neovim wget unzip + wayland ]; # Some programs need SUID wrappers, can be configured further or are