Change this -> my

This commit is contained in:
James Patrick 2022-08-13 22:42:04 -04:00
parent 588c47a6a1
commit 374135584c
35 changed files with 90 additions and 90 deletions

View File

@ -26,7 +26,7 @@
# ├─rpool/root/nixos zfs / # ├─rpool/root/nixos zfs /
# └─rpool/home zfs /home # └─rpool/home zfs /home
{ self, config, lib, pkgs, modulesPath, ... }: { { self, config, lib, pkgs, modulesPath, ... }: {
this.system = { my.system = {
zfs.enable = true; zfs.enable = true;
yubikey.enable = true; yubikey.enable = true;
}; };

View File

@ -1,15 +1,15 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.onepassword; cfg = config.my.application.onepassword;
graphical = config.this.graphical; graphical = config.my.graphical;
enable = (cfg.gui.enable || cfg.cli.enable); enable = (cfg.gui.enable || cfg.cli.enable);
in with lib; { in with lib; {
options = { options = {
this.application.onepassword.gui.enable = mkOption { my.application.onepassword.gui.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };
this.application.onepassword.cli.enable = mkOption { my.application.onepassword.cli.enable = mkOption {
default = (graphical.enable || cfg.gui.enable); default = (graphical.enable || cfg.gui.enable);
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.blueman; cfg = config.my.application.blueman;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.blueman.enable = mkOption { my.application.blueman.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,11 +1,11 @@
{ options, config, lib, pkgs, ... }: { options, config, lib, pkgs, ... }:
let let
cfg = config.this.application.dunst; cfg = config.my.application.dunst;
i3 = config.this.application.i3; i3 = config.my.application.i3;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.dunst.enable = mkOption { my.application.dunst.enable = mkOption {
default = i3.enable; default = i3.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -2,11 +2,11 @@
# TODO Still need the following dependecies # TODO Still need the following dependecies
# - Language tools (grammer) # - Language tools (grammer)
let let
cfg = config.this.application.emacs; cfg = config.my.application.emacs;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.emacs.enable = mkOption { my.application.emacs.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,9 +1,9 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.this.application.firefox; cfg = config.my.application.firefox;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options.this.application.firefox = { options.my.application.firefox = {
enable = mkOption { enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;

View File

@ -1,10 +1,10 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.this.application.firefox.tridactyl; cfg = config.my.application.firefox.tridactyl;
firefox = config.this.application.firefox; firefox = config.my.application.firefox;
in with lib; { in with lib; {
options = { options = {
this.application.firefox.tridactyl.enable = mkOption { my.application.firefox.tridactyl.enable = mkOption {
default = firefox.enable; default = firefox.enable;
type = with types; bool; type = with types; bool;
description = ""; description = "";

View File

@ -1,10 +1,10 @@
{ options, config, lib, pkgs, ... }: { options, config, lib, pkgs, ... }:
let let
cfg = config.this.application.gammastep; cfg = config.my.application.gammastep;
i3 = config.this.application.i3; i3 = config.my.application.i3;
in with lib; { in with lib; {
options = { options = {
this.application.gammastep.enable = mkOption { my.application.gammastep.enable = mkOption {
default = i3.enable; default = i3.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
graphical = config.this.graphical; graphical = config.my.graphical;
power = config.this.system.power; power = config.my.system.power;
keyring = config.this.system.keyring; keyring = config.my.system.keyring;
in with lib; { in with lib; {
config = mkIf graphical.enable { config = mkIf graphical.enable {
services.gvfs.enable = true; services.gvfs.enable = true;

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.i3; cfg = config.my.application.i3;
graphical = config.this.graphical; graphical = config.my.graphical;
modifier = "Mod4"; modifier = "Mod4";
wallpaper = pkgs.fetchurl { wallpaper = pkgs.fetchurl {
url = "https://i.imgur.com/6B4Hgw0.jpeg"; url = "https://i.imgur.com/6B4Hgw0.jpeg";
@ -10,7 +10,7 @@ let
in with lib; { in with lib; {
options = { options = {
this.application.i3.enable = mkOption { my.application.i3.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,11 +1,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.i3.picom; cfg = config.my.application.i3.picom;
i3 = config.this.application.i3; i3 = config.my.application.i3;
in with lib; { in with lib; {
options = { options = {
this.application.i3.picom.enable = mkOption { my.application.i3.picom.enable = mkOption {
default = i3.enable; default = i3.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.i3.polybar; cfg = config.my.application.i3.polybar;
i3 = config.this.application.i3; i3 = config.my.application.i3;
colors = { colors = {
alert = "#A54242"; alert = "#A54242";
background = "#000000"; background = "#000000";
@ -13,7 +13,7 @@ let
}; };
in with lib; { in with lib; {
options = { options = {
this.application.i3.polybar.enable = mkOption { my.application.i3.polybar.enable = mkOption {
default = i3.enable; default = i3.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,11 +1,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.i3.rofi; cfg = config.my.application.i3.rofi;
i3 = config.this.application.i3; i3 = config.my.application.i3;
in with lib; { in with lib; {
options = { options = {
this.application.i3.rofi.enable = mkOption { my.application.i3.rofi.enable = mkOption {
default = i3.enable; default = i3.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.kdeconnect; cfg = config.my.application.kdeconnect;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.kdeconnect.enable = mkOption { my.application.kdeconnect.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.kitty; cfg = config.my.application.kitty;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.kitty.enable = mkOption { my.application.kitty.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.media; cfg = config.my.application.media;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.media.enable = mkOption { my.application.media.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.nextcloud; cfg = config.my.application.nextcloud;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.nextcloud.enable = mkOption { my.application.nextcloud.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.spotify; cfg = config.my.application.spotify;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.spotify.enable = mkOption { my.application.spotify.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.zathura; cfg = config.my.application.zathura;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.zathura.enable = mkOption { my.application.zathura.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.application.zeal; cfg = config.my.application.zeal;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.application.zeal.enable = mkOption { my.application.zeal.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.lang.bash; cfg = config.my.lang.bash;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.lang.bash.enable = mkOption { my.lang.bash.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.lang.golang; cfg = config.my.lang.golang;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.lang.golang.enable = mkOption { my.lang.golang.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.lang.bash; cfg = config.my.lang.bash;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.lang.javascript.enable = mkOption { my.lang.javascript.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
options.this.graphical = { options.my.graphical = {
enable = lib.mkEnableOption "Does this actually need X/Wayland"; enable = lib.mkEnableOption "Does this actually need X/Wayland";
}; };

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let cfg = config.this.system.boot; let cfg = config.my.system.boot;
in with lib; { in with lib; {
options.this.system.boot.enable = mkOption { options.my.system.boot.enable = mkOption {
default = true; default = true;
type = with types; bool; type = with types; bool;
description = "Is there a physical power button?"; description = "Is there a physical power button?";

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.system.displaymanager; cfg = config.my.system.displaymanager;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
this.system.displaymanager.enable = mkOption { my.system.displaymanager.enable = mkOption {
default = graphical.enable; default = graphical.enable;
type = with types; bool; type = with types; bool;
}; };

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.system.flatpak; cfg = config.system.flatpak;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options = { options = {
system.flatpak.enable = mkOption { system.flatpak.enable = mkOption {

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let graphical = config.this.graphical; let graphical = config.my.graphical;
in { in {
config = lib.mkIf graphical.enable { config = lib.mkIf graphical.enable {
fonts = { fonts = {

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let graphical = config.this.graphical; let graphical = config.my.graphical;
in with lib; { in with lib; {
config = mkIf graphical.enable { config = mkIf graphical.enable {
home-manager.users.james = { home-manager.users.james = {

View File

@ -1,13 +1,13 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let cfg = config.this.system.keyring; let cfg = config.my.system.keyring;
in with lib; { in with lib; {
options.this = { options.my = {
system.keyring.enable = mkOption { system.keyring.enable = mkOption {
default = true; default = true;
type = with types; bool; type = with types; bool;
}; };
}; };
# options.this.system.keyring.enable = mkEnableOption "keyring"; # options.my.system.keyring.enable = mkEnableOption "keyring";
config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; }; config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; };
} }

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let cfg = config.this.system.power; let cfg = config.my.system.power;
in with lib; { in with lib; {
options.this.system.power.enable = mkEnableOption "Power Management"; options.my.system.power.enable = mkEnableOption "Power Management";
config = mkIf cfg.enable { config = mkIf cfg.enable {
# fan control modules # fan control modules

View File

@ -1,9 +1,9 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.this.system.yubikey; cfg = config.my.system.yubikey;
graphical = config.this.graphical; graphical = config.my.graphical;
in with lib; { in with lib; {
options.this.system.yubikey.enable = mkEnableOption "Yubikey"; options.my.system.yubikey.enable = mkEnableOption "Yubikey";
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.udev.packages = with pkgs; [ yubikey-personalization ]; services.udev.packages = with pkgs; [ yubikey-personalization ];

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let cfg = config.this.system.zfs; let cfg = config.my.system.zfs;
in with lib; { in with lib; {
options.this.system.zfs.enable = mkEnableOption "zfs"; options.my.system.zfs.enable = mkEnableOption "zfs";
config = mkIf cfg.enable { config = mkIf cfg.enable {
boot = { boot = {

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
imports = [ ./minimal.nix ]; imports = [ ./minimal.nix ];
this = { my = {
graphical.enable = true; graphical.enable = true;
system.power.enable = true; system.power.enable = true;
}; };

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
imports = [ ./graphical.nix ]; imports = [ ./graphical.nix ];
this.system.boot.enable = true; my.system.boot.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
users.users.james.extraGroups = [ "networkmanager" ]; users.users.james.extraGroups = [ "networkmanager" ];
} }