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

gave files.nix it's own directory, renamed all of the options ending with 'Opts' to end with 'Config' instead for consistency.

Browse Source
This commit is contained in:
pagedmov
2024-11-01 22:00:08 -04:00
parent 08bed40c52
commit 99b13fd979
18 changed files with 81 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
modules/home/default.nix
View File

@@ -12,47 +12,40 @@
./programs
./environment
./scripts
./files.nix
./files
];
# ./files
homeFiles.enable = lib.mkDefault true;
# ./environment
hyprlandConfig.enable = lib.mkDefault true;
autojumpOpts.enable = lib.mkDefault true;
stylixHomeOpts.enable = lib.mkDefault true;
autojumpConfig.enable = lib.mkDefault true;
stylixHomeConfig.enable = lib.mkDefault true;
waybarConfig.enable = lib.mkDefault true;
gtkOpts.enable = lib.mkDefault true;
spicetifyOpts.enable = lib.mkDefault true;
gtkConfig.enable = lib.mkDefault true;
spicetifyConfig.enable = lib.mkDefault true;
starshipConfig.enable = lib.mkDefault true;
# ./programs
btopConfig.enable = lib.mkDefault true;
swayncConfig.enable = lib.mkDefault true;
userPkgs.enable = lib.mkDefault true;
cavaOpts.enable = lib.mkDefault true;
ezaOpts.enable = lib.mkDefault true;
cavaConfig.enable = lib.mkDefault true;
ezaConfig.enable = lib.mkDefault true;
firefoxConfig.enable = lib.mkDefault true;
fuzzelConfig.enable = lib.mkDefault true;
fzfOpts.enable = lib.mkDefault true;
fzfConfig.enable = lib.mkDefault true;
gitConfig.enable = lib.mkDefault true;
kittyConfig.enable = lib.mkDefault true;
yaziConfig.enable = lib.mkDefault true;
zshConfig.enable = lib.mkDefault true;
homeFiles.enable = lib.mkDefault true;
passConfig.enable = lib.mkDefault true;
batOpts.enable = lib.mkDefault true;
batConfig.enable = lib.mkDefault true;
# ./scripts
pagedmovScripts.enable = lib.mkDefault true;
pagedmovScripts.commandScripts.invoke.enable = lib.mkDefault true;
pagedmovScripts.commandScripts.runbg.enable = lib.mkDefault true;
pagedmovScripts.commandScripts.splash.enable = lib.mkDefault true;
pagedmovScripts.commandScripts.toolbelt.enable = lib.mkDefault true;
pagedmovScripts.commandScripts.viconf.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.chpaper.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.scheck.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.chscheme.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.keyring.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.moveonscreen.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.switchmon.enable = lib.mkDefault true;
pagedmovScripts.nixShortcuts.garbage-collect.enable = lib.mkDefault true;
pagedmovScripts.nixShortcuts.nsp.enable = lib.mkDefault true;
pagedmovScripts.nixShortcuts.rebuild.enable = lib.mkDefault true;
pagedmovScripts.commandScripts.enable = lib.mkDefault true;
pagedmovScripts.hyprlandControls.enable = lib.mkDefault true;
pagedmovScripts.nixShortcuts.enable = lib.mkDefault true;
}

4
modules/home/environment/gtk.nix
View File

@@ -1,8 +1,8 @@
{lib, config, pkgs, ... }: {
options = {
gtkOpts.enable = lib.mkEnableOption "enable my gtk options";
gtkConfig.enable = lib.mkEnableOption "enable my gtk options";
};
config = lib.mkIf config.gtkOpts.enable {
config = lib.mkIf config.gtkConfig.enable {
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
(nerdfonts.override {

4
modules/home/environment/spicetify.nix
View File

@@ -2,9 +2,9 @@
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in {
options = {
spicetifyOpts.enable = lib.mkEnableOption "enable my spicetify options";
spicetifyConfig.enable = lib.mkEnableOption "enable my spicetify options";
};
config = lib.mkIf config.spicetifyOpts.enable {
config = lib.mkIf config.spicetifyConfig.enable {
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"spotify"

4
modules/home/environment/stylix.nix
View File

@@ -1,8 +1,8 @@
{lib, config, pkgs, scheme, wallpaper, ... }: {
options = {
stylixHomeOpts.enable = lib.mkEnableOption "enables my stylix Home-Manager options";
stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options";
};
config = lib.mkIf config.stylixHomeOpts.enable {
config = lib.mkIf config.stylixHomeConfig.enable {
stylix = {
enable = true;
autoEnable = true;

7
modules/home/files/default.nix Normal file
View File

@@ -0,0 +1,7 @@
{ ... }:
# This folder is for programs that do not have existing configuration modules in NixOS.
# Basically a to-do list for stuff I need to write my own modules for.
{
imports = [ ./neofetch.nix ];
}

0
modules/home/files.nix → modules/home/files/neofetch.nix
View File

4
modules/home/programs/autojump.nix
View File

@@ -1,8 +1,8 @@
{lib, config, ...}: {
options = {
autojumpOpts.enable = lib.mkEnableOption "enables my autojump options";
autojumpConfig.enable = lib.mkEnableOption "enables my autojump options";
};
config = lib.mkIf config.autojumpOpts.enable {
config = lib.mkIf config.autojumpConfig.enable {
programs.autojump = {
enable = true;
enableZshIntegration = true;

4
modules/home/programs/bat.nix
View File

@@ -1,8 +1,8 @@
{lib, config, inputs, ...}: {
options = {
batOpts.enable = lib.mkEnableOption "enables my bat options";
batConfig.enable = lib.mkEnableOption "enables my bat options";
};
config = lib.mkIf config.batOpts.enable {
config = lib.mkIf config.batConfig.enable {
programs.bat = {
enable = true;
config = {

4
modules/home/programs/cava.nix
View File

@@ -1,8 +1,8 @@
{lib, config, inputs, pkgs, ... }: {
options = {
cavaOpts.enable = lib.mkEnableOption "enables my cava settings";
cavaConfig.enable = lib.mkEnableOption "enables my cava settings";
};
config = lib.mkIf config.cavaOpts.enable {
config = lib.mkIf config.cavaConfig.enable {
programs.cava = {
enable = true;
};

4
modules/home/programs/eza.nix
View File

@@ -1,8 +1,8 @@
{lib, config, ...}: {
options = {
ezaOpts.enable = lib.mkEnableOption "enables my eza options";
ezaConfig.enable = lib.mkEnableOption "enables my eza options";
};
config = lib.mkIf config.ezaOpts.enable {
config = lib.mkIf config.ezaConfig.enable {
programs.eza = {
enable = true;
enableZshIntegration = false;

4
modules/home/programs/fzf.nix
View File

@@ -1,8 +1,8 @@
{lib, config, ...}: {
options = {
fzfOpts.enable = lib.mkEnableOption "enables my fzf options";
fzfConfig.enable = lib.mkEnableOption "enables my fzf options";
};
config = lib.mkIf config.fzfOpts.enable {
config = lib.mkIf config.fzfConfig.enable {
programs.fzf = {
enable = true;
enableZshIntegration = true;

42
modules/home/scripts/default.nix
View File

@@ -22,39 +22,49 @@
chpaper = import ./wm-controls/chpaper.nix { inherit pkgs; };
in {
options = {
pagedmovScripts.enable = lib.mkEnableOption "enables pagedmov's scripts";
pagedmovScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts";
# Enable or disable by group
pagedmovScripts.commandScripts.enable =
lib.mkEnableOption "Enables all command scripts";
pagedmovScripts.hyprlandControls.enable =
lib.mkEnableOption "Enables all Hyprland control scripts";
pagedmovScripts.nixShortcuts.enable =
lib.mkEnableOption "Enables all Nix shortcut scripts";
# These options override individual scripts
pagedmovScripts.commandScripts.invoke.enable =
lib.mkEnableOption "enables the invoke command";
lib.mkDefault (config.pagedmovScripts.commandScripts.enable) // lib.mkEnableOption "Enables the invoke command";
pagedmovScripts.commandScripts.runbg.enable =
lib.mkEnableOption "enables the runbg command - written by FrostPhoenix";
lib.mkDefault (config.pagedmovScripts.commandScripts.enable) // lib.mkEnableOption "Enables the runbg command - written by FrostPhoenix";
pagedmovScripts.commandScripts.splash.enable =
lib.mkEnableOption "enables the splash screen when opening a terminal";
lib.mkDefault (config.pagedmovScripts.commandScripts.enable) // lib.mkEnableOption "Enables the splash screen when opening a terminal";
pagedmovScripts.commandScripts.toolbelt.enable =
lib.mkEnableOption "enables the toolbelt command";
lib.mkDefault (config.pagedmovScripts.commandScripts.enable) // lib.mkEnableOption "Enables the toolbelt command";
pagedmovScripts.commandScripts.viconf.enable =
lib.mkEnableOption "enables the viconf command";
lib.mkDefault (config.pagedmovScripts.commandScripts.enable) // lib.mkEnableOption "Enables the viconf command";
pagedmovScripts.hyprlandControls.chpaper.enable =
lib.mkEnableOption "enables the chpaper command";
lib.mkDefault (config.pagedmovScripts.hyprlandControls.enable) // lib.mkEnableOption "Enables the chpaper command";
pagedmovScripts.hyprlandControls.scheck.enable =
lib.mkEnableOption "enables the chpaper command";
lib.mkDefault (config.pagedmovScripts.hyprlandControls.enable) // lib.mkEnableOption "Enables the scheck command";
pagedmovScripts.hyprlandControls.chscheme.enable =
lib.mkEnableOption "enables the chscheme command";
lib.mkDefault (config.pagedmovScripts.hyprlandControls.enable) // lib.mkEnableOption "Enables the chscheme command";
pagedmovScripts.hyprlandControls.keyring.enable =
lib.mkEnableOption "enables the keyring command";
lib.mkDefault (config.pagedmovScripts.hyprlandControls.enable) // lib.mkEnableOption "Enables the keyring command";
pagedmovScripts.hyprlandControls.moveonscreen.enable =
lib.mkEnableOption "enables the moveonscreen command, makes sure that the edges of floating windows are always on screen";
lib.mkDefault (config.pagedmovScripts.hyprlandControls.enable) // lib.mkEnableOption "Ensures floating windows remain on screen";
pagedmovScripts.hyprlandControls.switchmon.enable =
lib.mkEnableOption "moves your cursor to the center of your second monitor; currently only supports two monitors";
lib.mkDefault (config.pagedmovScripts.hyprlandControls.enable) // lib.mkEnableOption "Moves cursor to the center of the second monitor";
pagedmovScripts.nixShortcuts.garbage-collect.enable =
lib.mkEnableOption "enables the garbage-collect script, runs nixos garbage collection and empties the gtrash bin";
lib.mkDefault (config.pagedmovScripts.nixShortcuts.enable) // lib.mkEnableOption "Enables the garbage-collect script";
pagedmovScripts.nixShortcuts.nsp.enable =
lib.mkEnableOption "enables nsp, essentially an alias for 'nix-shell -p'";
lib.mkDefault (config.pagedmovScripts.nixShortcuts.enable) // lib.mkEnableOption "Enables nsp as an alias for 'nix-shell -p'";
pagedmovScripts.nixShortcuts.rebuild.enable =
lib.mkEnableOption "enables rebuild, an alias for 'sudo nixos-rebuild switch --flake $FLAKEPATH#$(hostname)'";
lib.mkDefault (config.pagedmovScripts.nixShortcuts.enable) // lib.mkEnableOption "Enables rebuild as an alias for 'sudo nixos-rebuild switch'";
};
config = lib.mkIf config.pagedmovScripts.enable {
home.packages = lib.optionals config.pagedmovScripts.commandScripts.invoke.enable [ invoke ]
++ lib.optionals config.pagedmovScripts.commandScripts.runbg.enable [ runbg ]
@@ -63,7 +73,7 @@ in {
++ lib.optionals config.pagedmovScripts.commandScripts.viconf.enable [ viconf ]
++ lib.optionals config.pagedmovScripts.hyprlandControls.chpaper.enable [ chpaper ]
++ lib.optionals config.pagedmovScripts.hyprlandControls.chpaper.enable [ scheck ]
++ lib.optionals config.pagedmovScripts.hyprlandControls.scheck.enable [ scheck ]
++ lib.optionals config.pagedmovScripts.hyprlandControls.chscheme.enable [ chscheme ]
++ lib.optionals config.pagedmovScripts.hyprlandControls.keyring.enable [ keyring ]
++ lib.optionals config.pagedmovScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ]