sravan/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Variable Re-Org and Rename

Browse Source 
- Remove unused stylix module from flake
- Move desktop and desktopType from user to system settings
- Rename `hardwareConfiguration` to `hwConfig`
This commit is contained in:
Sravan Balaji 2024-03-28 15:19:53 -04:00
parent 9fdaf9bdbd
commit b6ed41211b
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -9,13 +9,10 @@
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
stylix.url = "github:danth/stylix";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, stylix, disko, ... }:
let
# --- SYSTEM SETTINGS --- #
systemSettings = {
@ -25,7 +22,9 @@
timezone = "America/New_York"; # Time Zone
locale = "en_US.UTF-8"; # Locale
diskoConfig = "luks-btrfs-subvolumes"; # Select the disko config that was used to partition drive
hardwareConfiguration = "system76-oryx-pro-7"; # Select the hardware config from hardware directory
hwConfig = "oryp7"; # Select the hardware config from hardware directory
desktop = "dwm"; # Selected window manager or desktop environment
desktopType = "x11"; # x11 or wayland
};
# --- USER SETTINGS --- #
@ -35,8 +34,6 @@
email = "balajsra@umich.edu"; # Email (used for certain configurations)
dotfilesDir = "~/.dotfiles"; # Absolute path of the local repo
theme = "dracula"; # Selected theme from themes directory
desktop = "dwm"; # Selected window manager or desktop environment
desktopType = "x11"; # x11 or wayland
browser = "vivaldi"; # Default browser
term = "kitty"; # Default terminal command
editor = "vim"; # Default editor
@ -80,7 +77,6 @@
inherit pkgs-stable;
inherit systemSettings;
inherit userSettings;
inherit (inputs) stylix;
};
};
};
@ -97,7 +93,6 @@
inherit pkgs-stable;
inherit systemSettings;
inherit userSettings;
inherit (inputs) stylix;
};
};
};

0
hosts/system76-oryx-pro-7.nix → hosts/oryp7.nix
View File

4
profiles/personal/configuration.nix
View File

@ -6,8 +6,8 @@
{
imports = [
(../../hosts + "/${systemSettings.hardwareConfiguration}.nix")
(../../system/gui + "/${userSettings.desktop}.nix")
(../../hosts + "/${systemSettings.hwConfig}.nix")
(../../system/gui + "/${systemSettings.desktop}.nix")
../../system/hardware/default.nix
../../system/security/default.nix
../../system/utilities/default.nix

6
system/gui/gnome.nix
View File

@ -1,14 +1,14 @@
{ config, lib, pkgs, userSettings, ... }:
{ config, lib, pkgs, systemSettings, ... }:
{
imports = [
./default.nix
(if userSettings.desktopType == "x11" then ./x11.nix else "")
(if systemSettings.desktopType == "x11" then ./x11.nix else "")
];
services.xserver.displayManager.gdm = {
enable = true;
wayland = (if userSettings.desktopType == "x11" then false else true);
wayland = (if systemSettings.desktopType == "x11" then false else true);
};
services.xserver.desktopManager.gnome.enable = true;
}

8
system/gui/kde.nix
View File

@ -1,15 +1,15 @@
{ config, lib, pkgs, userSettings, ... }:
{ config, lib, pkgs, systemSettings, ... }:
{
imports = [
./default.nix
(if userSettings.desktopType == "x11" then ./x11.nix else "")
(if systemSettings.desktopType == "x11" then ./x11.nix else "")
];
services.xserver.displayManager = {
sddm.enable = true;
sddm.wayland.enable = (if userSettings.desktopType == "x11" then false else true);
defaultSession = (if userSettings.desktopType == "x11" then "plasmax11" else "plasma");
sddm.wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
defaultSession = (if systemSettings.desktopType == "x11" then "plasmax11" else "plasma");
};
services.desktopManager.plasma6.enable = true;
}