karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor custom options

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-06-11 19:02:35 +01:00
parent 229169de0f
commit 0b15c9c3fa
27 changed files with 46 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/common/configs/system/cpu/default.nix
View File

@@ -1,4 +0,0 @@
{ ... }:
{
imports = [ ./options.nix ];
}

7
hosts/common/configs/system/default.nix Normal file
View File

@@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./cpu/options.nix
./impermanence/options.nix
];
}

2
hosts/common/configs/system/impermanence/default.nix
View File

@@ -1,7 +1,5 @@
{ config, pkgs, ... }:
{
imports = [ ./options.nix ];
# uuidgen -r | tr -d -
# https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/administration/systemd-state.section.md
# https://github.com/NixOS/nixpkgs/pull/286140/files

2
hosts/common/configs/user/console/xdg/default.nix
View File

@@ -18,8 +18,6 @@
};
home-manager.users.${user} = {
imports = [ (import ./options.nix { inherit home; }) ];
xdg = {
enable = true;
mimeApps.enable = true;

112
hosts/common/configs/user/console/xdg/options.nix
View File

@@ -1,112 +0,0 @@
{
home ? throw "home argument is required",
}:
{ config, lib, ... }:
let
cfg = config.xdg;
in
{
options.xdg =
with lib;
with types;
{
relativeCacheHome = mkOption {
type = str;
readOnly = true;
default = ".cache";
description = "Relative path to directory holding application caches.";
};
relativeConfigHome = mkOption {
type = str;
readOnly = true;
default = ".config";
description = "Relative path to directory holding application configurations.";
};
relativeDataHome = mkOption {
type = str;
readOnly = true;
default = ".local/share";
description = "Relative path to directory holding application data.";
};
relativeStateHome = mkOption {
type = str;
readOnly = true;
default = ".local/state";
description = "Relative path to directory holding application states.";
};
userDirs = {
relativeDesktop = mkOption {
type = str;
readOnly = true;
default = "Desktop";
description = "Relative path to the Desktop directory.";
};
relativeDocuments = mkOption {
type = str;
readOnly = true;
default = "Documents";
description = "Relative path to the Documents directory.";
};
relativeDownload = mkOption {
type = str;
readOnly = true;
default = "Downloads";
description = "Relative path to the Downloads directory.";
};
relativeMusic = mkOption {
type = str;
readOnly = true;
default = "Music";
description = "Relative path to the Music directory.";
};
relativePictures = mkOption {
type = str;
readOnly = true;
default = "Pictures";
description = "Relative path to the Pictures directory.";
};
relativeTemplates = mkOption {
type = str;
readOnly = true;
default = "Templates";
description = "Relative path to the Templates directory.";
};
relativeVideos = mkOption {
type = str;
readOnly = true;
default = "Videos";
description = "Relative path to the Videos directory.";
};
};
};
config.xdg =
with lib;
with cfg;
{
cacheHome = mkDefault "${home}/${relativeCacheHome}";
configHome = mkDefault "${home}/${relativeConfigHome}";
dataHome = mkDefault "${home}/${relativeDataHome}";
stateHome = mkDefault "${home}/${relativeStateHome}";
userDirs = with userDirs; {
desktop = mkDefault "${home}/${relativeDesktop}";
documents = mkDefault "${home}/${relativeDocuments}";
download = mkDefault "${home}/${relativeDownload}";
music = mkDefault "${home}/${relativeMusic}";
pictures = mkDefault "${home}/${relativePictures}";
templates = mkDefault "${home}/${relativeTemplates}";
videos = mkDefault "${home}/${relativeVideos}";
};
};
}

2
hosts/common/configs/user/console/yazi/theme.toml
View File

@@ -94,7 +94,7 @@ footer = { fg = "{{colors.surface.default.hex}}", bg = "{{colors.on_surface.def
prepend_dirs = [
{ name = ".cache", text = "" },
{ name = ".local", text = "󱋣" },
{ name = "Games", text = "" },
{ name = "Games", text = "󰊖" },
{ name = "git", text = "" },
{ name = "Templates", text = "" },
{ name = "VMs", text = "" },

2
hosts/common/configs/user/console/zsh/default.nix
View File

@@ -12,8 +12,6 @@
};
home-manager.users.${user} = {
imports = [ ./options.nix ];
programs.zsh = {
enable = true;
dotDir = ".config/zsh";

18
hosts/common/configs/user/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{
user ? throw "user argument is required",
home ? throw "home argument is required",
}:
{ ... }:
{
imports = [
./options.nix
];
home-manager.users.${user}.imports = [
./console/zsh/options.nix
./gui/clipbook/options.nix
./gui/hyprland/options.nix
(import ./gui/theme/options.nix { inherit user home; })
./gui/vscode/options.nix
];
}

2
hosts/common/configs/user/gui/clipbook/default.nix
View File

@@ -13,8 +13,6 @@ let
in
{
home-manager.users.${user} = {
imports = [ ./options.nix ];
programs.clipbook.enable = true;
wayland.windowManager.hyprland.settings.bind =

2
hosts/common/configs/user/gui/hyprland/default.nix
View File

@@ -26,8 +26,6 @@
};
home-manager.users.${user} = {
imports = [ ./options.nix ];
wayland.windowManager.hyprland = {
enable = true;
systemd.enable = false;

2
hosts/common/configs/user/gui/theme/default.nix
View File

@@ -17,8 +17,6 @@ in
environment.persistence."/persist/state"."${home}/.config/theme" = { };
home-manager.users.${user} = {
imports = [ (import ./options.nix { inherit user home; }) ];
theme.enable = true;
wayland.windowManager.hyprland.settings.bind = [

2
hosts/common/configs/user/gui/theme/options.nix
View File

@@ -68,7 +68,7 @@ in
configDir = mkOption {
type = str;
default = "${config.xdg.configHome}/theme";
default = "${home}/.config/theme";
description = "The path to the theme config directory.";
};

2
hosts/common/configs/user/gui/vscode/default.nix
View File

@@ -17,8 +17,6 @@ in
environment.persistence."/persist/state"."${home}/.config/Code" = { };
home-manager.users.${user} = {
imports = [ ./options.nix ];
programs.vscode = {
enable = true;
mutableExtensionsDir = false;

4
hosts/elara/default.nix
View File

@@ -5,16 +5,16 @@
inputs.disko.nixosModules.disko
./format.nix
./hardware
../common/configs/system
../common/configs/system/bluetooth
../common/configs/system/boot
../common/configs/system/brightnessctl
../common/configs/system/btrbk
../common/configs/system/btrfs
../common/configs/system/cloudflared
../common/configs/system/cpu
../common/configs/system/dnsmasq
../common/configs/system/documentation
../common/configs/system/getty

2
hosts/elara/users/nikara/default.nix
View File

@@ -7,7 +7,7 @@ let
in
{
imports = [
../../../common/configs/user/options.nix
(import ../../../common/configs/user { inherit user home; })
(import ../../../common/configs/user/console/android { inherit user home; })
(import ../../../common/configs/user/console/brightnessctl { inherit user home; })

4
hosts/himalia/default.nix
View File

@@ -3,15 +3,15 @@
imports = [
inputs.disko.nixosModules.disko
./format.nix
./hardware
../common/configs/system
../common/configs/system/bluetooth
../common/configs/system/boot
../common/configs/system/brightnessctl
../common/configs/system/btrbk
../common/configs/system/btrfs
../common/configs/system/cpu
../common/configs/system/documentation
../common/configs/system/getty
../common/configs/system/git

2
hosts/himalia/users/nick/default.nix
View File

@@ -7,7 +7,7 @@ let
in
{
imports = [
../../../common/configs/user/options.nix
(import ../../../common/configs/user { inherit user home; })
(import ../../../common/configs/user/console/android { inherit user home; })
(import ../../../common/configs/user/console/brightnessctl { inherit user home; })

3
hosts/installer/default.nix
View File

@@ -3,9 +3,10 @@
imports = [
inputs.disko.nixosModules.disko
./format.nix
./hardware
../common/configs/system
../common/configs/system/boot
../common/configs/system/brightnessctl
../common/configs/system/btrfs

2
hosts/installer/users/nick/default.nix
View File

@@ -7,7 +7,7 @@ let
in
{
imports = [
../../../common/configs/user/options.nix
(import ../../../common/configs/user { inherit user home; })
(import ../../../common/configs/user/console/btop { inherit user home; })
(import ../../../common/configs/user/console/fastfetch { inherit user home; })

3
hosts/jupiter-vps/default.nix
View File

@@ -3,9 +3,10 @@
imports = [
inputs.disko.nixosModules.disko
./format.nix
./hardware
../common/configs/system
../common/configs/system/btrfs
../common/configs/system/impermanence
../common/configs/system/neovim

4
hosts/jupiter/default.nix
View File

@@ -3,14 +3,14 @@
imports = [
inputs.disko.nixosModules.disko
./format.nix
./hardware
../common/configs/system
../common/configs/system/boot
../common/configs/system/brightnessctl
../common/configs/system/btrbk
../common/configs/system/btrfs
../common/configs/system/cpu
../common/configs/system/documentation
../common/configs/system/git
../common/configs/system/impermanence

2
hosts/jupiter/users/nick/default.nix
View File

@@ -7,7 +7,7 @@ let
in
{
imports = [
../../../common/configs/user/options.nix
(import ../../../common/configs/user { inherit user home; })
(import ../../../common/configs/user/console/btop { inherit user home; })
(import ../../../common/configs/user/console/dive { inherit user home; })

2
hosts/jupiter/users/storm/default.nix
View File

@@ -7,7 +7,7 @@ let
in
{
imports = [
../../../common/configs/user/options.nix
(import ../../../common/configs/user { inherit user home; })
(import ../../../common/configs/user/console/home-manager { inherit user home; })
(import ../../../common/configs/user/console/neovim { inherit user home; })

3
lib/scripts/add-host.sh
View File

@@ -165,9 +165,10 @@ cat <<EOF > "./hosts/$host/default.nix"
imports = [
inputs.disko.nixosModules.disko
./format.nix
./hardware
../common/configs/system
../common/configs/system/boot
../common/configs/system/btrfs
../common/configs/system/documentation

2
packages/default.nix
View File

@@ -34,8 +34,6 @@
docker-whoami = import ./docker/whoami { inherit pkgs; };
docker-yq = import ./docker/yq { inherit pkgs; };
go-mmproxy = import ./go-mmproxy { inherit pkgs; };
obsidian-plugin-better-word-count = import ./obsidian/plugins/better-word-count { inherit pkgs; };
obsidian-plugin-dataview = import ./obsidian/plugins/dataview { inherit pkgs; };
obsidian-plugin-excalidraw = import ./obsidian/plugins/excalidraw { inherit pkgs; };

3
packages/docker/base/default.nix
View File

@@ -9,11 +9,12 @@ pkgs.dockerTools.buildImage {
dockerTools.binSh
dockerTools.caCertificates
bashInteractive
ncurses
coreutils
gnugrep
findutils
iputils
curl
ncurses
];
pathsToLink = [
"/bin"

15
packages/go-mmproxy/default.nix
View File

@@ -1,15 +0,0 @@
{ pkgs, ... }:
# AUTO-UPDATE: nix-update --flake --version=branch=master go-mmproxy
pkgs.buildGoModule rec {
pname = "go-mmproxy";
version = "2.1-unstable-2023-11-20";
src = pkgs.fetchFromGitHub {
owner = "path-network";
repo = "go-mmproxy";
rev = "006247ca7ec618d2aff02052bac839ca769991a1";
hash = "sha256-sU0OYpJ0b/Fq5CzCA0TtC368LOyYCUkXt0pS4IEv8Ak=";
};
vendorHash = null;
}