james/nil
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

changed cfg -> this

Browse Source
This commit is contained in:
James Patrick 2022-08-13 22:42:16 -04:00
parent 374135584c
commit f4dfcb7358
27 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/applications/1password.nix
View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.onepassword;
this = config.my.application.onepassword;
graphical = config.my.graphical;
enable = (cfg.gui.enable || cfg.cli.enable);
enable = (this.gui.enable || this.cli.enable);
in with lib; {
options = {
my.application.onepassword.gui.enable = mkOption {
@ -10,16 +10,16 @@ in with lib; {
type = with types; bool;
};
my.application.onepassword.cli.enable = mkOption {
default = (graphical.enable || cfg.gui.enable);
default = (graphical.enable || this.gui.enable);
type = with types; bool;
};
};
config = mkIf enable (mkMerge [
(mkIf cfg.cli.enable {
(mkIf this.cli.enable {
home-manager.users.james.home.packages = with pkgs; [ _1password ];
})
(mkIf cfg.gui.enable {
(mkIf this.gui.enable {
home-manager.users.james = {
home.packages = with pkgs; [ _1password-gui ];
};

4
modules/applications/blueman.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.blueman;
this = config.my.application.blueman;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
hardware.bluetooth.enable = true;
home-manager.users.james = { home.packages = with pkgs; [ blueman ]; };
fileSystems."var/lib/bluetooth" = {

4
modules/applications/dunst.nix
View File

@ -1,6 +1,6 @@
{ options, config, lib, pkgs, ... }:
let
cfg = config.my.application.dunst;
this = config.my.application.dunst;
i3 = config.my.application.i3;
graphical = config.my.graphical;
in with lib; {
@ -11,7 +11,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
systemd.user.startServices = true;
services.dunst.enable = true;

4
modules/applications/emacs.nix
View File

@ -2,7 +2,7 @@
# TODO Still need the following dependecies
# - Language tools (grammer)
let
cfg = config.my.application.emacs;
this = config.my.application.emacs;
graphical = config.my.graphical;
in with lib; {
options = {
@ -12,7 +12,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
home-manager.users.james = {
programs.emacs = {

6
modules/applications/firefox/tridactyl.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
let
cfg = config.my.application.firefox.tridactyl;
this = config.my.application.firefox.tridactyl;
firefox = config.my.application.firefox;
in with lib; {
options = {
@ -11,9 +11,9 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
# firefox.pkg =
# pkgs.firefox.override { cfg = { enableTridactylNative = true; }; };
# pkgs.firefox.override { this = { enableTridactylNative = true; }; };
home-manager.users.james = {
programs.firefox = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ tridactyl ];

4
modules/applications/gammastep.nix
View File

@ -1,6 +1,6 @@
{ options, config, lib, pkgs, ... }:
let
cfg = config.my.application.gammastep;
this = config.my.application.gammastep;
i3 = config.my.application.i3;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
services.gammastep = {
enable = true;

4
modules/applications/i3/i3.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.i3;
this = config.my.application.i3;
graphical = config.my.graphical;
modifier = "Mod4";
wallpaper = pkgs.fetchurl {
@ -16,7 +16,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
programs.dconf.enable = true;
programs.light.enable = true;

4
modules/applications/i3/picom.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.i3.picom;
this = config.my.application.i3.picom;
i3 = config.my.application.i3;
in with lib; {
@ -11,7 +11,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
services.picom = {
enable = true;
backend = "glx";

4
modules/applications/i3/polybar.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.i3.polybar;
this = config.my.application.i3.polybar;
i3 = config.my.application.i3;
colors = {
alert = "#A54242";
@ -19,7 +19,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
services.polybar = {
enable = true;

4
modules/applications/i3/rofi.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.i3.rofi;
this = config.my.application.i3.rofi;
i3 = config.my.application.i3;
in with lib; {
@ -11,7 +11,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
home.packages = with pkgs; [ rofi-systemd rofi-power-menu ];
programs.rofi = {

4
modules/applications/kdeconnect.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.kdeconnect;
this = config.my.application.kdeconnect;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
# home-manager.users.james = {
# services.kdeconnect = {
# indicator = true;

4
modules/applications/kitty.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.kitty;
this = config.my.application.kitty;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
home.packages = with pkgs; [ kitty ];
programs.kitty = {

4
modules/applications/media.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.media;
this = config.my.application.media;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
programs.mpv = {
enable = true;

4
modules/applications/nextcloud.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.nextcloud;
this = config.my.application.nextcloud;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
home.packages = with pkgs; [ nextcloud-client ];
};

4
modules/applications/spotify.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.spotify;
this = config.my.application.spotify;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = { home.packages = with pkgs; [ spotify ]; };
# Local discovery - https://nixos.wiki/wiki/Spotify

4
modules/applications/zathura.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.zathura;
this = config.my.application.zathura;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = { programs.zathura = { enable = true; }; };
};
}

4
modules/applications/zeal.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.application.zeal;
this = config.my.application.zeal;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james.home.packages = with pkgs; [ zeal ];
};
}

4
modules/lang/bash.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.lang.bash;
this = config.my.lang.bash;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
home.packages = with pkgs; [
nodePackages.bash-language-server

4
modules/lang/golang.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.lang.golang;
this = config.my.lang.golang;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
programs.go = {
enable = true;

4
modules/lang/javascript.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.lang.bash;
this = config.my.lang.bash;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
home-manager.users.james = {
home.packages = with pkgs; [
nodePackages.npm

4
modules/system/boot.nix
View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
let cfg = config.my.system.boot;
let this = config.my.system.boot;
in with lib; {
options.my.system.boot.enable = mkOption {
default = true;
@ -7,7 +7,7 @@ in with lib; {
description = "Is there a physical power button?";
};
config = mkIf cfg.enable {
config = mkIf this.enable {
boot = {
# Enable bootloader & clear /tmp on boot.
cleanTmpDir = true;

4
modules/system/displaymanager.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.system.displaymanager;
this = config.my.system.displaymanager;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
services.xserver = {
enable = true;
displayManager = { gdm.enable = true; };

4
modules/system/flatpak.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
cfg = config.system.flatpak;
this = config.system.flatpak;
graphical = config.my.graphical;
in with lib; {
options = {
@ -10,7 +10,7 @@ in with lib; {
};
};
config = mkIf cfg.enable {
config = mkIf this.enable {
services.flatpak.enable = true;
xdg.portal = {
enable = true;

4
modules/system/keyring.nix
View File

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

4
modules/system/power.nix
View File

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

4
modules/system/yubikey.nix
View File

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

4
modules/system/zfs.nix
View File

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