sora/nixconfig
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases Activity

Autosys

Browse Source
This commit is contained in:
soraefir 2024-04-17 00:25:54 +02:00
parent 6441652b8c
commit b644c87517
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
6 changed files with 172 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
flake.nix
View File

@ -30,62 +30,67 @@
}; };
outputs = inputs: outputs = inputs:
let
let gen = import ./generator.nix { inherit inputs; }; gen = import ./generator.nix { inherit inputs; };
sys = builtins.attrNames
# (builtins.filterSource (path: type: type == "directory")
(builtins.readDir ./systems); # );
gensys = builtins.listToAttrs
(builtins.map (x: gen.generate { syspath = x; }) sys);
in { in {
devShells = import ./shells { inherit inputs; }; devShells = import ./shells { inherit inputs; };
inherit gensys;
nixosConfigurations = { # nixosConfigurations = {
valinor = gen.generate { # valinor = gen.generate {
type = "nixos"; # type = "nixos";
system = "x86_64-linux"; # system = "";
host = "valinor"; # host = "valinor";
}; # };
iriy = gen.generate { # iriy = gen.generate {
type = "nixos"; # type = "nixos";
system = "x86_64-linux"; # system = "x86_64-linux";
host = "iriy"; # host = "iriy";
}; # };
efir = gen.generate { # efir = gen.generate {
type = "nixos"; # type = "nixos";
system = "x86_64-linux"; # system = "x86_64-linux";
host = "efir"; # host = "efir";
}; # };
avalon = gen.generate { # avalon = gen.generate {
type = "nixos"; # type = "nixos";
system = "x86_64-linux"; # system = "x86_64-linux";
host = "avalon"; # host = "avalon";
}; # };
ci = gen.generate { # ci = gen.generate {
type = "nixos"; # type = "nixos";
system = "x86_64-linux"; # system = "x86_64-linux";
host = "ci"; # host = "ci";
}; # };
sandbox = gen.generate { # sandbox = gen.generate {
type = "nixos"; # type = "nixos";
system = "x86_64-linux"; # system = "x86_64-linux";
host = "sandbox"; # host = "sandbox";
}; # };
}; # };
darwinConfigurations = { # darwinConfigurations = {
asgard = gen.generate { # asgard = gen.generate {
type = "macos"; # type = "macos";
system = "x86_64-darwin"; # system = "x86_64-darwin";
host = "asgard"; # host = "asgard";
}; # };
}; # };
homeConfigurations = { # homeConfigurations = {
yomi = gen.generate { # yomi = gen.generate {
type = "home"; # type = "home";
system = "arm-64"; # system = "arm-64";
host = "example"; # host = "example";
}; # };
example = gen.generate { # example = gen.generate {
type = "home"; # type = "home";
system = "-"; # supports any # system = "-"; # supports any
host = "example"; # host = "example";
}; # };
}; # };
}; };
# ===== Unsupported/NotImplemented ====== # ===== Unsupported/NotImplemented ======

74
generator.nix
View File

@ -1,43 +1,47 @@
{ inputs, ... }: { { inputs, ... }: {
generate = { type, system, host }: generate = { syspath }:
let let
syscfg = import ./systems/${syspath}/cfg.nix;
nameValuePair = name: value: { inherit name value; }; nameValuePair = name: value: { inherit name value; };
syscfg = import ./systems/${host}/cfg.nix;
in ({ in ({
"nixos" = inputs.nixpkgs.lib.nixosSystem { "nixos" = {
system = system; nisoxConfigurations."${syscfg.hostname}" =
modules = [ inputs.nixpkgs.lib.nixosSystem {
./modules/shared/syscfg system = syscfg.system;
./modules/shared/sops modules = [
./modules/nixos ./modules/shared/syscfg
syscfg ./modules/shared/sops
./systems/${host} ./modules/nixos
inputs.sops-nix.nixosModules.sops syscfg
inputs.home-manager.nixosModules.home-manager syspath
{ inputs.sops-nix.nixosModules.sops
home-manager.useGlobalPkgs = true; inputs.home-manager.nixosModules.home-manager
home-manager.useUserPackages = true; {
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.useGlobalPkgs = true;
home-manager.users = builtins.listToAttrs (map (userConfig: home-manager.useUserPackages = true;
nameValuePair userConfig.username { home-manager.extraSpecialArgs = { inherit inputs; };
imports = [ home-manager.users = builtins.listToAttrs (map (userConfig:
./modules/shared/syscfg nameValuePair userConfig.username {
./modules/shared/colors imports = [
./modules/home ./modules/shared/syscfg
syscfg ./modules/shared/colors
{ usercfg = userConfig; } ./modules/home
inputs.nix-colors.homeManagerModule syscfg
inputs.hyprland.homeManagerModules.default { usercfg = userConfig; }
]; inputs.nix-colors.homeManagerModule
}) syscfg.syscfg.users); inputs.hyprland.homeManagerModules.default
} ];
]; }) syscfg.syscfg.users);
}
];
};
}; };
"macos" = inputs.darwin.lib.darwinSystem { "macos" = inputs.darwin.lib.darwinSystem {
system = system; system = syscfg.system;
modules = [ modules = [
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
./systems/${host} syspath
inputs.home-manager.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -47,15 +51,15 @@
imports = [ imports = [
inputs.nix-colors.homeManagerModule inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules inputs.hyprland.homeManagerModules
./systems/${host}/home.nix ./systems/${syspath}/home.nix
]; ];
}; };
} }
]; ];
}; };
"home" = inputs.home-manager.lib.homeManagerConfiguration { "home" = inputs.home-manager.lib.homeManagerConfiguration {
modules = [ ./modules/home ./systems/${host}/home.nix ]; modules = [ ./modules/home ./systems/${syscfg.hostname}/home.nix ];
}; };
_ = throw "Unsupported system"; _ = throw "Unsupported system";
}.${type}); }.${syscfg.type});
} }

123
modules/nixos/system/xdg/default.nix
View File

@ -1,67 +1,68 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
config = lib.mkMerge[ config = lib.mkMerge [
(lib.mkIf (config.syscfg.make.gui) { (lib.mkIf (config.syscfg.make.gui) {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
# wlr.enable = true; # wlr.enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
]; ];
config.common.default = [ "hyprland" "gtk" ]; config.common.default = [ "hyprland" "gtk" ];
}; };
environment.sessionVariables = rec { environment.sessionVariables = rec {
GBM_BACKEND = "amd-drm"; GBM_BACKEND = "amd-drm";
__GL_GSYNC_ALLOWED = "0"; __GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "1"; __GL_VRR_ALLOWED = "1";
WLR_DRM_NO_ATOMIC = "1"; WLR_DRM_NO_ATOMIC = "1";
__GLX_VENDOR_LIBRARY_NAME = "amd"; __GLX_VENDOR_LIBRARY_NAME = "amd";
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
GDK_BACKEND = "wayland"; GDK_BACKEND = "wayland";
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan"; WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan"; WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "24"; XCURSOR_SIZE = "24";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}; };
}) })
({ ({
environment.sessionVariables = rec { environment.sessionVariables = rec {
PATH = [ "$HOME/.local/bin/:$PATH" ]; PATH = [ "$HOME/.local/bin/:$PATH" ];
XDG_CACHE_HOME = "$HOME/.cache"; XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config"; XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share"; XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state"; XDG_STATE_HOME = "$HOME/.local/state";
XDG_BIN_HOME = "$HOME/.local/bin"; XDG_BIN_HOME = "$HOME/.local/bin";
XDG_DESKTOP_DIR = "$HOME/desktop"; XDG_DESKTOP_DIR = "$HOME/desktop";
XDG_DOCUMENTS_DIR = "$HOME/files"; XDG_DOCUMENTS_DIR = "$HOME/files";
XDG_DOWNLOAD_DIR = "$HOME/download"; XDG_DOWNLOAD_DIR = "$HOME/download";
XDG_MUSIC_DIR = "$HOME/media/music"; XDG_MUSIC_DIR = "$HOME/media/music";
XDG_PICTURES_DIR = "$HOME/media/photo"; XDG_PICTURES_DIR = "$HOME/media/photo";
XDG_PUBLICSHARE_DIR = "$HOME/pub"; XDG_PUBLICSHARE_DIR = "$HOME/pub";
XDG_TEMPLATES_DIR = "$HOME/media/templates"; XDG_TEMPLATES_DIR = "$HOME/media/templates";
XDG_VIDEOS_DIR = "$HOME/media/video"; XDG_VIDEOS_DIR = "$HOME/media/video";
}; };
environment.etc."xdg/user-dirs.defaults".text = '' environment.etc."xdg/user-dirs.defaults".text = ''
XDG_CACHE_HOME="$HOME/.cache" XDG_CACHE_HOME="$HOME/.cache"
XDG_CONFIG_HOME="$HOME/.config" XDG_CONFIG_HOME="$HOME/.config"
XDG_DATA_HOME="$HOME/.local/share" XDG_DATA_HOME="$HOME/.local/share"
XDG_STATE_HOME="$HOME/.local/state" XDG_STATE_HOME="$HOME/.local/state"
XDG_BIN_HOME="$HOME/.local/bin" XDG_BIN_HOME="$HOME/.local/bin"
XDG_DESKTOP_DIR="$HOME/desktop" XDG_DESKTOP_DIR="$HOME/desktop"
XDG_DOCUMENTS_DIR="$HOME/files" XDG_DOCUMENTS_DIR="$HOME/files"
XDG_DOWNLOAD_DIR="$HOME/download" XDG_DOWNLOAD_DIR="$HOME/download"
XDG_MUSIC_DIR="$HOME/media/music" XDG_MUSIC_DIR="$HOME/media/music"
XDG_PICTURES_DIR="$HOME/media/photo" XDG_PICTURES_DIR="$HOME/media/photo"
XDG_PUBLICSHARE_DIR="$HOME/pub" XDG_PUBLICSHARE_DIR="$HOME/pub"
XDG_TEMPLATES_DIR="$HOME/media/templates" XDG_TEMPLATES_DIR="$HOME/media/templates"
XDG_VIDEOS_DIR="$HOME/media/video" XDG_VIDEOS_DIR="$HOME/media/video"
''; '';
})]; })
];
} }

2
modules/server/default.nix
View File

@ -1,4 +1,4 @@
{ ... }: { ... }:
{ {
virtualisation.arion.projects. # virtualisation.arion.projects.
} }

8
modules/shared/syscfg/default.nix
View File

@ -98,6 +98,14 @@ in with lib; {
options.usercfg = userOpt; options.usercfg = userOpt;
options.syscfg = { options.syscfg = {
hostname = mkOption { type = types.str; }; hostname = mkOption { type = types.str; };
type = mkOption {
type = types.enum [ "nixos" "macos" "home" ];
default = "nixos";
};
system = mkOption {
type = types.enum [ "x86_64-linux" "x86_64-darwin" "-" ];
default = "x86_64-linux";
};
defaultUser = mkOption { type = types.str; }; defaultUser = mkOption { type = types.str; };
make = makeOpt; make = makeOpt;
net = netOpt; net = netOpt;

3
systems/asguard/cfg.nix Normal file
View File

@ -0,0 +1,3 @@
{
}