SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 14:01:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename the namespace of the home-modules

Browse source
This commit is contained in:
SebastianStork 2025-05-27 22:47:12 +02:00
parent 06623cd93a
commit f0df314f21
25 changed files with 74 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/home/de-utils/brightnessctl.nix
View file

@ -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 ]; home.packages = [ pkgs.brightnessctl ];
}; };
} }

6
modules/home/de-utils/cliphist.nix
View file

@ -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 = [ assertions = [
{ {
assertion = config.myConfig.deUtils.rofi.enable; assertion = config.custom.deUtils.programs.rofi.enable;
message = "cliphist requires rofi"; message = "cliphist requires rofi";
} }
]; ];

4
modules/home/de-utils/gammastep.nix
View file

@ -1,8 +1,8 @@
{ config, lib, ... }@moduleArgs: { 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 = [ assertions = [
{ {
assertion = assertion =

8
modules/home/de-utils/hypridle.nix
View file

@ -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 = { services.hypridle = {
enable = true; enable = true;
settings = { settings = {
general = { 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"; before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on"; after_sleep_cmd = "hyprctl dispatch dpms on";
}; };
listener = [ listener = [
(lib.mkIf config.myConfig.deUtils.brightnessctl.enable { (lib.mkIf config.custom.deUtils.programs.brightnessctl.enable {
timeout = 5 * 60; timeout = 5 * 60;
on-timeout = "brightnessctl --save --exponent set 10%"; on-timeout = "brightnessctl --save --exponent set 10%";
on-resume = "brightnessctl --restore"; on-resume = "brightnessctl --restore";

5
modules/home/de-utils/hyprlock.nix
View file

@ -4,10 +4,10 @@
... ...
}@moduleArgs: }@moduleArgs:
let let
cfg = config.myConfig.deUtils.hyprlock; cfg = config.custom.deUtils.programs.hyprlock;
in in
{ {
options.myConfig.deUtils.hyprlock = { options.custom.deUtils.programs.hyprlock = {
enable = lib.mkEnableOption ""; enable = lib.mkEnableOption "";
fprintAuth = lib.mkEnableOption "" // { fprintAuth = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.services.fprintd.enable or false; default = moduleArgs.osConfig.services.fprintd.enable or false;
@ -17,7 +17,6 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = true;
settings = { settings = {
general.immediate_render = true; general.immediate_render = true;
auth."fingerprint:enabled" = cfg.fprintAuth; auth."fingerprint:enabled" = cfg.fprintAuth;

5
modules/home/de-utils/hyprpaper.nix
View file

@ -1,11 +1,10 @@
{ config, lib, ... }: { 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 = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
preload = [ "~/Pictures/.wallpaper" ]; preload = [ "~/Pictures/.wallpaper" ];
wallpaper = [ ", ~/Pictures/.wallpaper" ]; wallpaper = [ ", ~/Pictures/.wallpaper" ];

6
modules/home/de-utils/rofi/default.nix
View file

@ -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 ]; home.packages = [ pkgs.rofi-wayland ];
xdg.configFile."rofi/config.rasi".source = xdg.configFile."rofi/config.rasi".source =
@ -17,7 +17,7 @@
dark = ./dark-theme.rasi; dark = ./dark-theme.rasi;
light = ./light-theme.rasi; light = ./light-theme.rasi;
} }
.${config.myConfig.theme}; .${config.custom.theme};
in in
pkgs.concatText "rofi-config" [ pkgs.concatText "rofi-config" [
./config.rasi ./config.rasi

4
modules/home/de-utils/waybar.nix
View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { 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 = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;

15
modules/home/de/hyprland/default.nix
View file

@ -5,11 +5,11 @@
... ...
}@moduleArgs: }@moduleArgs:
{ {
options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // { options.custom.de.hyprland.enable = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.custom.de.hyprland.enable or false; 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 = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = null; package = null;
@ -21,16 +21,21 @@
pkgs.grimblast pkgs.grimblast
]; ];
myConfig.deUtils = { custom.deUtils = {
rofi.enable = true; services = {
hyprpaper.enable = true; hyprpaper.enable = true;
hyprlock.enable = true;
hypridle.enable = true; hypridle.enable = true;
waybar.enable = true; waybar.enable = true;
cliphist.enable = true; cliphist.enable = true;
gammastep.enable = true; gammastep.enable = true;
}; };
programs = {
rofi.enable = true;
hyprlock.enable = true;
};
};
services.dunst.enable = true; services.dunst.enable = true;
}; };
} }

4
modules/home/de/hyprland/keybinds.nix
View file

@ -1,6 +1,6 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf config.myConfig.de.hyprland.enable { config = lib.mkIf config.custom.de.hyprland.enable {
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
# Bindflags: # Bindflags:
# r = release # r = release
@ -83,7 +83,7 @@
bindel = SUPER ALT, down, exec, $volume-down bindel = SUPER ALT, down, exec, $volume-down
bindl = SUPER ALT, M, exec, $mute-mic bindl = SUPER ALT, M, exec, $mute-mic
${lib.optionalString config.myConfig.deUtils.brightnessctl.enable '' ${lib.optionalString config.custom.deUtils.programs.brightnessctl.enable ''
# Adjust brightness # Adjust brightness
bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2% bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2%
bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%- bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%-

6
modules/home/de/hyprland/settings.nix
View file

@ -1,6 +1,6 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf config.myConfig.de.hyprland.enable { config = lib.mkIf config.custom.de.hyprland.enable {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
input = { input = {
kb_layout = "de"; kb_layout = "de";
@ -36,13 +36,13 @@
dark = "rgb(ffffff)"; dark = "rgb(ffffff)";
light = "rgb(000000)"; light = "rgb(000000)";
} }
.${config.myConfig.theme}; .${config.custom.theme};
"col.inactive_border" = "col.inactive_border" =
{ {
dark = "rgba(ffffff00)"; dark = "rgba(ffffff00)";
light = "rgba(ffffff00)"; light = "rgba(ffffff00)";
} }
.${config.myConfig.theme}; .${config.custom.theme};
layout = "master"; layout = "master";
}; };

4
modules/home/firefox.nix
View file

@ -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 = { programs.firefox = {
enable = true; enable = true;

4
modules/home/git.nix
View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { 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 = { sops.secrets = {
"ssh-key/github" = { }; "ssh-key/github" = { };
"ssh-key/hda-gitlab" = { }; "ssh-key/hda-gitlab" = { };

6
modules/home/kitty.nix
View file

@ -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 = { programs.kitty = {
enable = true; enable = true;
@ -18,7 +18,7 @@
dark = "default"; dark = "default";
light = "GitHub_Light"; light = "GitHub_Light";
} }
.${config.myConfig.theme}; .${config.custom.theme};
in in
{ {
include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf"; include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf";

4
modules/home/shell/aliases.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
{ {
config = lib.mkIf config.myConfig.shell.zsh.enable { config = lib.mkIf config.custom.shell.zsh.enable {
home.packages = [ home.packages = [
pkgs.eza pkgs.eza
pkgs.bat pkgs.bat
@ -28,7 +28,7 @@
dark = ""; dark = "";
light = "GitHub"; light = "GitHub";
} }
.${config.myConfig.theme}; .${config.custom.theme};
in in
{ {
cat = "bat --plain --theme=${theme}"; cat = "bat --plain --theme=${theme}";

4
modules/home/shell/default.nix
View file

@ -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 = { programs = {
zsh = { zsh = {
enable = true; enable = true;

2
modules/home/shell/p10k/default.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
{ {
config = lib.mkIf config.myConfig.shell.zsh.enable { config = lib.mkIf config.custom.shell.zsh.enable {
programs.zsh = { programs.zsh = {
plugins = [ plugins = [
{ {

4
modules/home/sops.nix
View file

@ -8,9 +8,9 @@
{ {
imports = [ inputs.sops-nix.homeManagerModules.sops ]; 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 = { sops = {
age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
defaultSopsFile = defaultSopsFile =

4
modules/home/tailscale.nix
View file

@ -1,10 +1,10 @@
{ config, lib, ... }@moduleArgs: { 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; 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 = { programs.ssh = {
enable = true; enable = true;
matchBlocks.installer.extraOptions = { matchBlocks.installer.extraOptions = {

4
modules/home/theme.nix
View file

@ -5,10 +5,10 @@
... ...
}: }:
let let
cfgTheme = config.myConfig.theme; cfgTheme = config.custom.theme;
in in
{ {
options.myConfig.theme = lib.mkOption { options.custom.theme = lib.mkOption {
type = lib.types.enum [ type = lib.types.enum [
"dark" "dark"
"light" "light"

4
modules/home/virt-manager.nix
View file

@ -1,10 +1,10 @@
{ config, lib, ... }@moduleArgs: { 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; 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" = { dconf.settings."org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ]; autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ]; uris = [ "qemu:///system" ];

6
modules/home/vscode.nix
View file

@ -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 = { programs.vscode = {
enable = true; enable = true;
package = pkgs-unstable.vscodium; package = pkgs-unstable.vscodium;
@ -37,7 +37,7 @@
dark = "GitHub Dark"; dark = "GitHub Dark";
light = "GitHub Light"; light = "GitHub Light";
} }
.${config.myConfig.theme}; .${config.custom.theme};
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"editor.fontFamily" = "JetBrainsMono Nerd Font"; "editor.fontFamily" = "JetBrainsMono Nerd Font";
"explorer.confirmDelete" = false; "explorer.confirmDelete" = false;

4
users/seb/@fern/home.nix
View file

@ -3,9 +3,9 @@ _: {
home.stateVersion = "24.11"; home.stateVersion = "24.11";
myConfig = { custom = {
theme = "light"; theme = "light";
deUtils.brightnessctl.enable = true; deUtils.programs.brightnessctl.enable = true;
}; };
wayland.windowManager.hyprland.settings.monitor = [ wayland.windowManager.hyprland.settings.monitor = [

2
users/seb/@north/home.nix
View file

@ -4,7 +4,7 @@
home.stateVersion = "23.11"; home.stateVersion = "23.11";
myConfig.theme = "dark"; custom.theme = "dark";
home.packages = [ home.packages = [
pkgs.ffmpeg pkgs.ffmpeg

9
users/seb/home.nix
View file

@ -23,14 +23,17 @@ in
home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config"; home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config";
myConfig = { custom = {
kitty.enable = true;
firefox.enable = true;
sops.enable = true; sops.enable = true;
shell.zsh.enable = true; shell.zsh.enable = true;
programs = {
kitty.enable = true;
firefox.enable = true;
git.enable = true; git.enable = true;
vscode.enable = true; vscode.enable = true;
}; };
};
home.packages = [ home.packages = [
pkgs.bottom pkgs.bottom