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

Compare commits

base: sora:6441652b8cb53c59b795f7652b4ff211991fe386
Branches Tags
sora:main
sora:renovate/determinatesystems-magic-nix-cache-action-9.x
...
compare: sora:150d2f2e07ec82b21ee126a00418fc329a521cb1
Branches Tags
sora:renovate/determinatesystems-magic-nix-cache-action-9.x
sora:main

2 Commits
6441652b8c ... 150d2f2e07

Author SHA1 Message Date
soraefir
150d2f2e07
Cfg updated
All checks were successful
Nix Build / build-nixos (push) Successful in 4m51s
Details
2024-04-17 08:26:08 +02:00
soraefir
b644c87517
Autosys 2024-04-17 00:25:54 +02:00
11 changed files with 116 additions and 125 deletions
Show Stats Expand all files Collapse all files

57
flake.nix
View File

@ -30,61 +30,22 @@
}; };
outputs = inputs: outputs = inputs:
let gen = import ./generator.nix { inherit inputs; }; let gen = import ./generator.nix { inherit inputs; };
in { in {
devShells = import ./shells { inherit inputs; }; devShells = import ./shells { inherit inputs; };
nixosConfigurations = { nixosConfigurations = {
valinor = gen.generate { valinor = gen.generate { host = "valinor"; };
type = "nixos"; iriy = gen.generate { host = "iriy"; };
system = "x86_64-linux"; efir = gen.generate { host = "efir"; };
host = "valinor"; avalon = gen.generate { host = "avalon"; };
}; ci = gen.generate { host = "ci"; };
iriy = gen.generate { sandbox = gen.generate { host = "sandbox"; };
type = "nixos";
system = "x86_64-linux";
host = "iriy";
};
efir = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "efir";
};
avalon = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "avalon";
};
ci = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "ci";
};
sandbox = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "sandbox";
};
};
darwinConfigurations = {
asgard = gen.generate {
type = "macos";
system = "x86_64-darwin";
host = "asgard";
};
}; };
darwinConfigurations = { asgard = gen.generate { host = "asgard"; }; };
homeConfigurations = { homeConfigurations = {
yomi = gen.generate { yomi = gen.generate { host = "example"; };
type = "home"; example = gen.generate { host = "example"; };
system = "arm-64";
host = "example";
};
example = gen.generate {
type = "home";
system = "-"; # supports any
host = "example";
};
}; };
}; };

32
generator.nix
View File

@ -1,11 +1,11 @@
{ inputs, ... }: { { inputs, ... }: {
generate = { type, system, host }: generate = { host }:
let let
nameValuePair = name: value: { inherit name value; };
syscfg = import ./systems/${host}/cfg.nix; syscfg = import ./systems/${host}/cfg.nix;
nameValuePair = name: value: { inherit name value; };
in ({ in ({
"nixos" = inputs.nixpkgs.lib.nixosSystem { "nixos" = inputs.nixpkgs.lib.nixosSystem {
system = system; system = syscfg.syscfg.system;
modules = [ modules = [
./modules/shared/syscfg ./modules/shared/syscfg
./modules/shared/sops ./modules/shared/sops
@ -33,29 +33,33 @@
} }
]; ];
}; };
"macos" = inputs.darwin.lib.darwinSystem { "macos" = inputs.darwin.lib.darwinSystem {
system = system; system = syscfg.system;
modules = [ modules = [
inputs.sops-nix.nixosModules.sops ./modules/shared/syscfg
./modules/shared/sops
syscfg
./systems/${host} ./systems/${host}
inputs.sops-nix.nixosModules.sops
inputs.home-manager.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.sora = { home-manager.users = builtins.listToAttrs (map (userConfig:
imports = [ nameValuePair userConfig.username {
inputs.nix-colors.homeManagerModule imports = [
inputs.hyprland.homeManagerModules inputs.nix-colors.homeManagerModule
./systems/${host}/home.nix inputs.hyprland.homeManagerModules
]; ];
}; }) syscfg.syscfg.users);
} }
]; ];
}; };
"home" = inputs.home-manager.lib.homeManagerConfiguration { "home" = inputs.home-manager.lib.homeManagerConfiguration {
modules = [ ./modules/home ./systems/${host}/home.nix ]; modules = [ ./modules/home ];
}; };
_ = throw "Unsupported system"; _ = throw "Unsupported system";
}.${type}); }.${syscfg.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;

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

@ -0,0 +1,8 @@
{
syscfg = {
hostname = "asguard";
defaultUser = "sora";
type = "macos";
system = "x86_64-darwin";
};
}

3
systems/avalon/cfg.nix
View File

@ -1,6 +1,8 @@
{ {
syscfg = { syscfg = {
hostname = "avalon"; hostname = "avalon";
system = "x86_64-linux";
type = "nixos";
defaultUser = "sora"; defaultUser = "sora";
users = [ users = [
{ {
@ -36,7 +38,6 @@
enable = true; enable = true;
ip4 = "10.10.1.2/32"; ip4 = "10.10.1.2/32";
ip6 = "fd10:10:10::2/128"; ip6 = "fd10:10:10::2/128";
pk = config.sops.secrets.avalon_wg_priv.path;
}; };
}; };
} }

2
systems/ci/cfg.nix
View File

@ -1,6 +1,8 @@
{ {
syscfg = { syscfg = {
hostname = "ci"; hostname = "ci";
type = "nixos";
system = "x86_64-linux";
defaultUser = "ci"; defaultUser = "ci";
users = [{ users = [{
username = "ci"; username = "ci";

2
systems/iriy/cfg.nix
View File

@ -1,6 +1,8 @@
{ {
syscfg = { syscfg = {
hostname = "iriy"; hostname = "iriy";
type = "nixos";
system = "x86_64-linux";
defaultUser = "sora"; defaultUser = "sora";
users = [{ users = [{
username = "sora"; username = "sora";

2
systems/sandbox/cfg.nix
View File

@ -1,6 +1,8 @@
{ {
syscfg = { syscfg = {
hostname = "sandbox"; hostname = "sandbox";
type = "nixos";
system = "x86_64-linux";
defaultUser = "sora"; defaultUser = "sora";
users = [{ users = [{
username = "sora"; username = "sora";

2
systems/valinor/cfg.nix
View File

@ -1,6 +1,8 @@
{ {
syscfg = { syscfg = {
hostname = "valinor"; hostname = "valinor";
type = "nixos";
system = "x86_64-linux";
defaultUser = "sora"; defaultUser = "sora";
users = [{ users = [{
username = "sora"; username = "sora";