Merged Host/Home Opt into SysOpt
All checks were successful
Nix Build / build-nixos (push) Successful in 5m27s

This commit is contained in:
soraefir
2024-04-14 07:57:07 +02:00
parent 0a02d67b7e
commit 972cb47e3f
65 changed files with 331 additions and 338 deletions

View File

@ -4,8 +4,8 @@
programs.home-manager.enable = true;
home = {
username = "${config.homecfg.username}";
homeDirectory = "/home/${config.homecfg.username}";
username = "${config.usercfg.username}";
homeDirectory = "/home/${config.usercfg.username}";
stateVersion = "23.11";
};

View File

@ -2,10 +2,10 @@
programs.git = {
enable = true;
userEmail = "${config.homecfg.git.email}";
userName = "${config.homecfg.git.username}";
userEmail = "${config.usercfg.git.email}";
userName = "${config.usercfg.git.username}";
signing = {
key = "${config.homecfg.git.key}";
key = "${config.usercfg.git.key}";
signByDefault = true;
};
ignores = [ "*result*" ".direnv" "node_modules" ];

View File

@ -1 +1 @@
{ ... }: { imports = [ ./base ./cli ./gui ./homecfg ./wayland ./xdg ./xorg ]; }
{ ... }: { imports = [ ./base ./cli ./gui ./wayland ./xdg ./xorg ]; }

View File

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: {
imports = [ ./vscodium ];
config = lib.mkIf (config.homecfg.make.develop) {
config = lib.mkIf (config.syscfg.make.develop) {
home.packages = with pkgs; [ blender godot_4 ];
};
}

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.develop) {
config = lib.mkIf (config.syscfg.make.develop) {
programs.vscode = {
enable = true;
package = pkgs.vscodium;

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.firefox = {
enable = true;
profiles = {

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.imv.enable = true;
programs.obs-studio.enable = true;

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.mpv = {
enable = true;
scripts = with pkgs; [ mpvScripts.mpris ];

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
xdg.configFile."pipewire/pipewire-pulse.conf.d/desktop.conf".text = ''
context.modules = [
{ name = libpipewire-module-loopback

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
home.packages = with pkgs; [
custom.vosk.base
jq

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.zathura = {
enable = true;
extraConfig = ''

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
services.nextcloud-client.enable = true;
home.packages = with pkgs; [

View File

@ -2,7 +2,7 @@
imports = [ ./openttd.nix ];
config = lib.mkIf (config.homecfg.make.game) {
config = lib.mkIf (config.syscfg.make.game) {
home.packages = with pkgs; [
# custom.simc

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.game) {
config = lib.mkIf (config.syscfg.make.game) {
xdg.configFile."openttd/openttd.cfg".text = ''
[misc]
display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS

View File

@ -5,7 +5,7 @@ let
wallpaperGen = import ./wallpaper-gen.nix { inherit pkgs config; };
in {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
home.pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";

View File

@ -1,43 +0,0 @@
{ inputs, lib, config, ... }:
with lib; {
options.homecfg = {
username = mkOption { type = types.str; };
wm = mkOption {
type = types.enum [ "Wayland" "X11" ];
default = "Wayland";
};
make = {
cli = mkOption {
type = types.bool;
default = true;
};
gui = mkOption {
type = types.bool;
default = false;
};
develop = mkOption {
type = types.bool;
default = false;
};
game = mkOption {
type = types.bool;
default = false;
};
power = mkOption {
type = types.bool;
default = false;
};
};
git = {
username = mkOption { type = types.str; };
email = mkOption { type = types.str; };
key = mkOption { type = types.str; };
};
};
imports = with inputs; [
nix-colors.homeManagerModules.default
../../shared/colors
];
}

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ libnotify ];
services.dunst = {
enable = true;

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ eww jq jaq custom.amdgpu_top ];
xdg.configFile."eww" = {

View File

@ -17,7 +17,7 @@ let
''
}/bin/waybar-${name}";
in {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = [ pkgs.custom.amdgpu_top pkgs.jq ];

View File

@ -1,5 +1,5 @@
{ lib, pkgs, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ swayidle swaylock-effects ];

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ wofi ];
xdg.configFile."wofi/config".text = ''
width=280

View File

@ -11,7 +11,7 @@ let
'';
};
in {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [
dbus-hyprland-environment

View File

@ -1,5 +1,5 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
imports = [ ./config.nix ];
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
wayland.windowManager.hyprland = { enable = true; };
};
}

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xsession.windowManager.bspwm.extraConfig = ''
#! /bin/bash

View File

@ -2,7 +2,7 @@
imports = [ ./config.nix ./script.nix ./xressources.nix ];
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xsession.windowManager.bspwm = { enable = true; };
services.sxhkd = { enable = true; };
home.packages = with pkgs; [ xrandr arandr flameshot xtrlock i3lock ];

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xdg.configFile."script/lock.sh".text = ''
#!/bin/bash
TMPBG=/tmp/screen.png

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xresources.extraConfig = ''
#define white #ffffff