mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 14:01:34 +01:00
Rename the namespace of the home-modules
This commit is contained in:
parent
06623cd93a
commit
f0df314f21
25 changed files with 74 additions and 68 deletions
|
|
@ -5,9 +5,9 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.deUtils.brightnessctl.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.programs.brightnessctl.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.brightnessctl.enable {
|
||||
config = lib.mkIf config.custom.deUtils.programs.brightnessctl.enable {
|
||||
home.packages = [ pkgs.brightnessctl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.deUtils.cliphist.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.services.cliphist.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.cliphist.enable {
|
||||
config = lib.mkIf config.custom.deUtils.services.cliphist.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.myConfig.deUtils.rofi.enable;
|
||||
assertion = config.custom.deUtils.programs.rofi.enable;
|
||||
message = "cliphist requires rofi";
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ config, lib, ... }@moduleArgs:
|
||||
{
|
||||
options.myConfig.deUtils.gammastep.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.services.gammastep.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.gammastep.enable {
|
||||
config = lib.mkIf config.custom.deUtils.services.gammastep.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
|
|
|
|||
|
|
@ -4,21 +4,21 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.deUtils.hypridle.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.services.hypridle.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.hypridle.enable {
|
||||
config = lib.mkIf config.custom.deUtils.services.hypridle.enable {
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
general = {
|
||||
lock_cmd = lib.mkIf config.myConfig.deUtils.hyprlock.enable "pidof hyprlock || hyprlock";
|
||||
lock_cmd = lib.mkIf config.custom.deUtils.programs.hyprlock.enable "pidof hyprlock || hyprlock";
|
||||
before_sleep_cmd = "loginctl lock-session";
|
||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||
};
|
||||
|
||||
listener = [
|
||||
(lib.mkIf config.myConfig.deUtils.brightnessctl.enable {
|
||||
(lib.mkIf config.custom.deUtils.programs.brightnessctl.enable {
|
||||
timeout = 5 * 60;
|
||||
on-timeout = "brightnessctl --save --exponent set 10%";
|
||||
on-resume = "brightnessctl --restore";
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
...
|
||||
}@moduleArgs:
|
||||
let
|
||||
cfg = config.myConfig.deUtils.hyprlock;
|
||||
cfg = config.custom.deUtils.programs.hyprlock;
|
||||
in
|
||||
{
|
||||
options.myConfig.deUtils.hyprlock = {
|
||||
options.custom.deUtils.programs.hyprlock = {
|
||||
enable = lib.mkEnableOption "";
|
||||
fprintAuth = lib.mkEnableOption "" // {
|
||||
default = moduleArgs.osConfig.services.fprintd.enable or false;
|
||||
|
|
@ -17,7 +17,6 @@ in
|
|||
config = lib.mkIf cfg.enable {
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
general.immediate_render = true;
|
||||
auth."fingerprint:enabled" = cfg.fprintAuth;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
options.myConfig.deUtils.hyprpaper.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.services.hyprpaper.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.hyprpaper.enable {
|
||||
config = lib.mkIf config.custom.deUtils.services.hyprpaper.enable {
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
preload = [ "~/Pictures/.wallpaper" ];
|
||||
wallpaper = [ ", ~/Pictures/.wallpaper" ];
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.deUtils.rofi.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.programs.rofi.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.rofi.enable {
|
||||
config = lib.mkIf config.custom.deUtils.programs.rofi.enable {
|
||||
home.packages = [ pkgs.rofi-wayland ];
|
||||
|
||||
xdg.configFile."rofi/config.rasi".source =
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
dark = ./dark-theme.rasi;
|
||||
light = ./light-theme.rasi;
|
||||
}
|
||||
.${config.myConfig.theme};
|
||||
.${config.custom.theme};
|
||||
in
|
||||
pkgs.concatText "rofi-config" [
|
||||
./config.rasi
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
options.myConfig.deUtils.waybar.enable = lib.mkEnableOption "";
|
||||
options.custom.deUtils.services.waybar.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.deUtils.waybar.enable {
|
||||
config = lib.mkIf config.custom.deUtils.services.waybar.enable {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
...
|
||||
}@moduleArgs:
|
||||
{
|
||||
options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // {
|
||||
options.custom.de.hyprland.enable = lib.mkEnableOption "" // {
|
||||
default = moduleArgs.osConfig.custom.de.hyprland.enable or false;
|
||||
};
|
||||
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
config = lib.mkIf config.custom.de.hyprland.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = null;
|
||||
|
|
@ -21,16 +21,21 @@
|
|||
pkgs.grimblast
|
||||
];
|
||||
|
||||
myConfig.deUtils = {
|
||||
rofi.enable = true;
|
||||
custom.deUtils = {
|
||||
services = {
|
||||
hyprpaper.enable = true;
|
||||
hyprlock.enable = true;
|
||||
hypridle.enable = true;
|
||||
waybar.enable = true;
|
||||
cliphist.enable = true;
|
||||
gammastep.enable = true;
|
||||
};
|
||||
|
||||
programs = {
|
||||
rofi.enable = true;
|
||||
hyprlock.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.dunst.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
config = lib.mkIf config.custom.de.hyprland.enable {
|
||||
wayland.windowManager.hyprland.extraConfig = ''
|
||||
# Bindflags:
|
||||
# r = release
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
bindel = SUPER ALT, down, exec, $volume-down
|
||||
bindl = SUPER ALT, M, exec, $mute-mic
|
||||
|
||||
${lib.optionalString config.myConfig.deUtils.brightnessctl.enable ''
|
||||
${lib.optionalString config.custom.deUtils.programs.brightnessctl.enable ''
|
||||
# Adjust brightness
|
||||
bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2%
|
||||
bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%-
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
config = lib.mkIf config.custom.de.hyprland.enable {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
input = {
|
||||
kb_layout = "de";
|
||||
|
|
@ -36,13 +36,13 @@
|
|||
dark = "rgb(ffffff)";
|
||||
light = "rgb(000000)";
|
||||
}
|
||||
.${config.myConfig.theme};
|
||||
.${config.custom.theme};
|
||||
"col.inactive_border" =
|
||||
{
|
||||
dark = "rgba(ffffff00)";
|
||||
light = "rgba(ffffff00)";
|
||||
}
|
||||
.${config.myConfig.theme};
|
||||
.${config.custom.theme};
|
||||
layout = "master";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.firefox.enable = lib.mkEnableOption "";
|
||||
options.custom.programs.firefox.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.firefox.enable {
|
||||
config = lib.mkIf config.custom.programs.firefox.enable {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
options.myConfig.git.enable = lib.mkEnableOption "";
|
||||
options.custom.programs.git.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.git.enable {
|
||||
config = lib.mkIf config.custom.programs.git.enable {
|
||||
sops.secrets = {
|
||||
"ssh-key/github" = { };
|
||||
"ssh-key/hda-gitlab" = { };
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.kitty.enable = lib.mkEnableOption "";
|
||||
options.custom.programs.kitty.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.kitty.enable {
|
||||
config = lib.mkIf config.custom.programs.kitty.enable {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
dark = "default";
|
||||
light = "GitHub_Light";
|
||||
}
|
||||
.${config.myConfig.theme};
|
||||
.${config.custom.theme};
|
||||
in
|
||||
{
|
||||
include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
config = lib.mkIf config.myConfig.shell.zsh.enable {
|
||||
config = lib.mkIf config.custom.shell.zsh.enable {
|
||||
home.packages = [
|
||||
pkgs.eza
|
||||
pkgs.bat
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
dark = "";
|
||||
light = "GitHub";
|
||||
}
|
||||
.${config.myConfig.theme};
|
||||
.${config.custom.theme};
|
||||
in
|
||||
{
|
||||
cat = "bat --plain --theme=${theme}";
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.shell.zsh.enable = lib.mkEnableOption "";
|
||||
options.custom.shell.zsh.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.shell.zsh.enable {
|
||||
config = lib.mkIf config.custom.shell.zsh.enable {
|
||||
programs = {
|
||||
zsh = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
config = lib.mkIf config.myConfig.shell.zsh.enable {
|
||||
config = lib.mkIf config.custom.shell.zsh.enable {
|
||||
programs.zsh = {
|
||||
plugins = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
{
|
||||
imports = [ inputs.sops-nix.homeManagerModules.sops ];
|
||||
|
||||
options.myConfig.sops.enable = lib.mkEnableOption "";
|
||||
options.custom.sops.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.sops.enable {
|
||||
config = lib.mkIf config.custom.sops.enable {
|
||||
sops = {
|
||||
age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
|
||||
defaultSopsFile =
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ config, lib, ... }@moduleArgs:
|
||||
{
|
||||
options.myConfig.tailscale.enable = lib.mkEnableOption "" // {
|
||||
options.custom.services.tailscale.enable = lib.mkEnableOption "" // {
|
||||
default = moduleArgs.osConfig.custom.services.tailscale.enable or false;
|
||||
};
|
||||
|
||||
config = lib.mkIf config.myConfig.tailscale.enable {
|
||||
config = lib.mkIf config.custom.services.tailscale.enable {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks.installer.extraOptions = {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
cfgTheme = config.myConfig.theme;
|
||||
cfgTheme = config.custom.theme;
|
||||
in
|
||||
{
|
||||
options.myConfig.theme = lib.mkOption {
|
||||
options.custom.theme = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"dark"
|
||||
"light"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ config, lib, ... }@moduleArgs:
|
||||
{
|
||||
options.myConfig.virt-manager.enable = lib.mkEnableOption "" // {
|
||||
options.custom.programs.virt-manager.enable = lib.mkEnableOption "" // {
|
||||
default = moduleArgs.osConfig.programs.virt-manager.enable or false;
|
||||
};
|
||||
|
||||
config = lib.mkIf config.myConfig.virt-manager.enable {
|
||||
config = lib.mkIf config.custom.programs.virt-manager.enable {
|
||||
dconf.settings."org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = [ "qemu:///system" ];
|
||||
uris = [ "qemu:///system" ];
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.vscode.enable = lib.mkEnableOption "";
|
||||
options.custom.programs.vscode.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.vscode.enable {
|
||||
config = lib.mkIf config.custom.programs.vscode.enable {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.vscodium;
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
dark = "GitHub Dark";
|
||||
light = "GitHub Light";
|
||||
}
|
||||
.${config.myConfig.theme};
|
||||
.${config.custom.theme};
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"editor.fontFamily" = "JetBrainsMono Nerd Font";
|
||||
"explorer.confirmDelete" = false;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ _: {
|
|||
|
||||
home.stateVersion = "24.11";
|
||||
|
||||
myConfig = {
|
||||
custom = {
|
||||
theme = "light";
|
||||
deUtils.brightnessctl.enable = true;
|
||||
deUtils.programs.brightnessctl.enable = true;
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings.monitor = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
home.stateVersion = "23.11";
|
||||
|
||||
myConfig.theme = "dark";
|
||||
custom.theme = "dark";
|
||||
|
||||
home.packages = [
|
||||
pkgs.ffmpeg
|
||||
|
|
|
|||
|
|
@ -23,14 +23,17 @@ in
|
|||
|
||||
home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config";
|
||||
|
||||
myConfig = {
|
||||
kitty.enable = true;
|
||||
firefox.enable = true;
|
||||
custom = {
|
||||
sops.enable = true;
|
||||
shell.zsh.enable = true;
|
||||
|
||||
programs = {
|
||||
kitty.enable = true;
|
||||
firefox.enable = true;
|
||||
git.enable = true;
|
||||
vscode.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.bottom
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue