nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
home-manager/linux/default.nix
View File

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

2
home-manager/linux/programs/hyprland.nix
View File

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

5
machines/productivity-vm/home.nix
View File

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

6
modules/linux/default.nix
View File

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

2
modules/linux/hyprland.nix
View File

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