Remove references to sway

This commit is contained in:
Nathan McCarty 2023-06-18 16:39:16 -04:00
parent 7c995bfdce
commit 540d8f18fe
Signed by: thatonelutenist
SSH Key Fingerprint: SHA256:hwQEcmak9E6sdU9bXc98RHw/Xd1AhpB5HZT7ZSVJkRM
5 changed files with 10 additions and 13 deletions

View File

@ -54,13 +54,13 @@ with nLib; {
};
# Install games
games = { launcher = mkEnableOption "Game launcher"; };
# Swaywm and supoorting application configuration
swaywm = {
enable = mkDefaultOption "swaywm" config.nathan.config.isDesktop;
# Hyprland and supporting application configuration
hyprland = {
enable = mkDefaultOption "hyprland" config.nathan.config.isDesktop;
};
# Alacritty, follows sway
alacritty =
mkDefaultOption "alacritty" config.nathan.programs.swaywm.enable;
mkDefaultOption "alacritty" config.nathan.programs.hyprland.enable;
# Communications applications
communications = {
# Enable by default if we are on a linux desktop

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, inputs, ... }:
let nathan = config.nathan;
in with lib; {
config = mkIf nathan.programs.swaywm.enable (let
config = mkIf nathan.programs.hyprland.enable (let
swaylock-package =
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.swaylock-effects;
swaylock-command = ''

View File

@ -2,7 +2,6 @@
{
nathan = {
# services = { email = { enable = true; }; };
config = { isDesktop = true; };
programs = {
media.enable = false;
@ -13,14 +12,12 @@
sshSign = true;
};
};
# games = { launcher = true; };
# media.nicotineService = true;
};
};
home.packages = with pkgs; [ gammastep ];
# Sway outputs
# Hyprland outputs + tweaks
home.sessionVariables = {
"WLR_NO_HARDWARE_CURSORS" = "1";
"WLR_RENDERER" = "pixman";

View File

@ -173,13 +173,13 @@ in {
# On by default
autoUpdate = mkEnableOptionT "Nix autoupdating";
};
# Swaywm configuration
# hyprland configuration
# On by default if the system is a desktop
swaywm = {
hyprland = {
enable = mkOption {
default = config.nathan.config.isDesktop;
example = true;
description = "Whether to setup swaywm";
description = "Whether to setup hyprland";
type = lib.types.bool;
};
};

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, inputs, ... }:
let nc = config.nathan.config;
in with lib; {
config = mkIf nc.swaywm.enable {
config = mkIf nc.hyprland.enable {
# Turn on GDM for login
services.xserver = {
enable = true;