nix fmt rfc
This commit is contained in:
parent
70c2531a96
commit
4f7d3dd44e
10
flake.nix
10
flake.nix
|
@ -37,7 +37,9 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = inputs: let
|
||||
outputs =
|
||||
inputs:
|
||||
let
|
||||
lib = inputs.snowfall-lib.mkLib {
|
||||
inherit inputs;
|
||||
src = ./.;
|
||||
|
@ -53,9 +55,11 @@
|
|||
};
|
||||
in
|
||||
lib.mkFlake {
|
||||
channels-config = {allowUnfree = true;};
|
||||
channels-config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
|
||||
outputs-builder = channels: {formatter = channels.nixpkgs.alejandra;};
|
||||
outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };
|
||||
|
||||
overlays = with inputs; [
|
||||
snowfall-flake.overlays.default
|
||||
|
|
|
@ -2,11 +2,12 @@
|
|||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
osConfig ? {},
|
||||
osConfig ? { },
|
||||
format ? "unknown",
|
||||
...
|
||||
}:
|
||||
with lib.wyrdgard; {
|
||||
with lib.wyrdgard;
|
||||
{
|
||||
wyrdgard = {
|
||||
apps = {
|
||||
kitty = enabled;
|
||||
|
|
|
@ -2,11 +2,12 @@
|
|||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
osConfig ? {},
|
||||
osConfig ? { },
|
||||
format ? "unknown",
|
||||
...
|
||||
}:
|
||||
with lib.wyrdgard; {
|
||||
with lib.wyrdgard;
|
||||
{
|
||||
wyrdgard = {
|
||||
apps = {
|
||||
kitty = enabled;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{lib, ...}:
|
||||
with lib; rec {
|
||||
{ lib, ... }:
|
||||
with lib;
|
||||
rec {
|
||||
## Create a NixOS module option.
|
||||
##
|
||||
## ```nix
|
||||
|
@ -7,8 +8,9 @@ with lib; rec {
|
|||
## ```
|
||||
##
|
||||
#@ Type -> Any -> String
|
||||
mkOpt = type: default: description:
|
||||
mkOption {inherit type default description;};
|
||||
mkOpt =
|
||||
type: default: description:
|
||||
mkOption { inherit type default description; };
|
||||
|
||||
## Create a NixOS module option without a description.
|
||||
##
|
||||
|
|
|
@ -6,15 +6,16 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.cli-apps.fish;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.cli-apps.fish = with types; {
|
||||
enable = mkBoolOpt true "Whether or not to enable the fish shell";
|
||||
};
|
||||
|
||||
config =
|
||||
mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs.fishPlugins; [
|
||||
forgit
|
||||
sponge
|
||||
|
@ -40,9 +41,7 @@ in {
|
|||
|
||||
zoxide = {
|
||||
enable = true;
|
||||
options = [
|
||||
"--cmd cd"
|
||||
];
|
||||
options = [ "--cmd cd" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,17 +1,13 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ lib, config, ... }:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.cli-apps.home-manager;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.cli-apps.home-manager = {
|
||||
enable = mkBoolOpt true "Enable home-manager";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.home-manager = enabled;
|
||||
};
|
||||
config = mkIf cfg.enable { programs.home-manager = enabled; };
|
||||
}
|
||||
|
|
|
@ -6,15 +6,16 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.cli-apps.starship;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.cli-apps.starship = with types; {
|
||||
enable = mkBoolOpt true "Whether or not to enable starship shell";
|
||||
};
|
||||
|
||||
config =
|
||||
mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
programs = {
|
||||
fish.shellInit = "
|
||||
|
||||
|
|
|
@ -5,17 +5,17 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.graphviz;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.graphviz = {
|
||||
enable = mkBoolOpt true "Whether or not you want to install graphviz";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
graphviz
|
||||
];
|
||||
home.packages = with pkgs; [ graphviz ];
|
||||
|
||||
home.shellAliases = {
|
||||
nixsize = "nix-du -n=50 | dot -Tsvg > ~/Pictures/store.svg";
|
||||
|
|
|
@ -5,17 +5,17 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.kitty;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.kitty = {
|
||||
enable = mkEnableOption "Kity";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
kitty
|
||||
];
|
||||
home.packages = with pkgs; [ kitty ];
|
||||
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.tools.direnv;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.tools.direnv = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable direnv.";
|
||||
};
|
||||
|
|
|
@ -6,10 +6,12 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.tools.git;
|
||||
user = config.wyrdgard.user;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.tools.git = {
|
||||
enable = mkBoolOpt true "Enable Git (Default true)";
|
||||
userName = mkOpt types.str user.fullName "The name to configure git with.";
|
||||
|
@ -22,9 +24,15 @@ in {
|
|||
inherit (cfg) userName userEmail;
|
||||
lfs = enabled;
|
||||
extraConfig = {
|
||||
init = {defaultBranch = "main";};
|
||||
pull = {rebase = false;};
|
||||
push = {autoSetupRemote = true;};
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
pull = {
|
||||
rebase = false;
|
||||
};
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -2,10 +2,16 @@
|
|||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
osConfig ? {},
|
||||
osConfig ? { },
|
||||
...
|
||||
}: let
|
||||
inherit (lib) types mkIf mkDefault mkMerge;
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
types
|
||||
mkIf
|
||||
mkDefault
|
||||
mkMerge
|
||||
;
|
||||
inherit (lib.wyrdgard) mkOpt;
|
||||
|
||||
cfg = config.wyrdgard.user;
|
||||
|
@ -14,15 +20,18 @@
|
|||
is-darwin = pkgs.stdenv.isDarwin;
|
||||
|
||||
home-directory =
|
||||
if cfg.name == null
|
||||
then null
|
||||
else if is-darwin
|
||||
then "/Users/${cfg.name}"
|
||||
else "/home/${cfg.name}";
|
||||
in {
|
||||
if cfg.name == null then
|
||||
null
|
||||
else if is-darwin then
|
||||
"/Users/${cfg.name}"
|
||||
else
|
||||
"/home/${cfg.name}";
|
||||
in
|
||||
{
|
||||
options.wyrdgard.user = {
|
||||
enable = mkOpt types.bool true "Whether to configure the user account.";
|
||||
name = mkOpt (types.nullOr types.str) (config.snowfallorg.user.name or "cholli") "The user account.";
|
||||
name = mkOpt (types.nullOr types.str) (config.snowfallorg.user.name or "cholli"
|
||||
) "The user account.";
|
||||
|
||||
fullName = mkOpt types.str "Christoph Hollizeck" "The full name of the user.";
|
||||
email = mkOpt types.str "christoph.hollizeck@hey.com" "The email of the user.";
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps._1password;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps._1password = with types; {
|
||||
enable = mkBoolOpt true "Enable 1Password";
|
||||
};
|
||||
|
@ -18,7 +20,7 @@ in {
|
|||
_1password.enable = true;
|
||||
_1password-gui = {
|
||||
enable = true;
|
||||
polkitPolicyOwners = [config.wyrdgard.user.name];
|
||||
polkitPolicyOwners = [ config.wyrdgard.user.name ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -6,14 +6,19 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.cli-apps.nixvim;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.cli-apps.nixvim = with types; {
|
||||
enable = mkBoolOpt true "Whether to enable nixvim or not (Default true)";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [less wyrdgard.neovim];
|
||||
environment.systemPackages = with pkgs; [
|
||||
less
|
||||
wyrdgard.neovim
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,16 +6,14 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.discord;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.discord = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable basic configuration";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
discord
|
||||
];
|
||||
};
|
||||
config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ discord ]; };
|
||||
}
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.steam;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.steam = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable support for Steam.";
|
||||
};
|
||||
|
@ -17,8 +19,6 @@ in {
|
|||
programs.steam.enable = true;
|
||||
programs.steam.remotePlay.openFirewall = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
steam
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ steam ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.apps.vivaldi;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.apps.vivaldi = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable vivaldi browser";
|
||||
};
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.archetypes.gaming;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.archetypes.gaming = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable the gaming archetype.";
|
||||
};
|
||||
|
|
|
@ -7,17 +7,17 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.home;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.home = with types; {
|
||||
file =
|
||||
mkOpt attrs {}
|
||||
(mdDoc "A set of files to be managed by home-manager's `home.file`.");
|
||||
configFile =
|
||||
mkOpt attrs {}
|
||||
(mdDoc "A set of files to be managed by home-manager's `xdg.configFile`.");
|
||||
extraOptions = mkOpt attrs {} "Options to pass directly to home-manager.";
|
||||
file = mkOpt attrs { } (mdDoc "A set of files to be managed by home-manager's `home.file`.");
|
||||
configFile = mkOpt attrs { } (
|
||||
mdDoc "A set of files to be managed by home-manager's `xdg.configFile`."
|
||||
);
|
||||
extraOptions = mkOpt attrs { } "Options to pass directly to home-manager.";
|
||||
};
|
||||
|
||||
config = {
|
||||
|
|
|
@ -7,35 +7,39 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.nix;
|
||||
|
||||
substituters-submodule = types.submodule ({name, ...}: {
|
||||
substituters-submodule = types.submodule (
|
||||
{ name, ... }:
|
||||
{
|
||||
options = with types; {
|
||||
key = mkOpt (nullOr str) null "The trusted public key for this substituter.";
|
||||
};
|
||||
});
|
||||
in {
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
options.wyrdgard.nix = with types; {
|
||||
enable = mkBoolOpt true "Whether or not to manage nix configuration.";
|
||||
package = mkOpt package pkgs.nixUnstable "Which nix package to use.";
|
||||
|
||||
default-substituter = {
|
||||
url = mkOpt str "https://cache.nixos.org" "The url for the substituter.";
|
||||
key = mkOpt str "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "The trusted public key for the substituter.";
|
||||
key =
|
||||
mkOpt str "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"The trusted public key for the substituter.";
|
||||
};
|
||||
|
||||
extra-substituters = mkOpt (attrsOf substituters-submodule) {} "Extra substituters to configure.";
|
||||
extra-substituters = mkOpt (attrsOf substituters-submodule) { } "Extra substituters to configure.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions =
|
||||
mapAttrsToList
|
||||
(name: value: {
|
||||
assertions = mapAttrsToList (name: value: {
|
||||
assertion = value.key != null;
|
||||
message = "wyrdgard.nix.extra-substituters.${name}.key must be set";
|
||||
})
|
||||
cfg.extra-substituters;
|
||||
}) cfg.extra-substituters;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
snowfallorg.flake
|
||||
|
@ -44,11 +48,14 @@ in {
|
|||
nix-du
|
||||
];
|
||||
|
||||
nix = let
|
||||
users =
|
||||
["root" config.wyrdgard.user.name]
|
||||
++ optional config.services.hydra.enable "hydra";
|
||||
in {
|
||||
nix =
|
||||
let
|
||||
users = [
|
||||
"root"
|
||||
config.wyrdgard.user.name
|
||||
] ++ optional config.services.hydra.enable "hydra";
|
||||
in
|
||||
{
|
||||
package = cfg.package;
|
||||
|
||||
settings =
|
||||
|
@ -62,12 +69,12 @@ in {
|
|||
trusted-users = users;
|
||||
allowed-users = users;
|
||||
|
||||
substituters =
|
||||
[cfg.default-substituter.url]
|
||||
++ (mapAttrsToList (name: value: name) cfg.extra-substituters);
|
||||
trusted-public-keys =
|
||||
[cfg.default-substituter.key]
|
||||
++ (mapAttrsToList (name: value: value.key) cfg.extra-substituters);
|
||||
substituters = [
|
||||
cfg.default-substituter.url
|
||||
] ++ (mapAttrsToList (name: value: name) cfg.extra-substituters);
|
||||
trusted-public-keys = [
|
||||
cfg.default-substituter.key
|
||||
] ++ (mapAttrsToList (name: value: value.key) cfg.extra-substituters);
|
||||
}
|
||||
// (lib.optionalAttrs config.wyrdgard.tools.direnv.enable {
|
||||
keep-outputs = true;
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.submodules.basics;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.submodules.basics = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable basic configuration.";
|
||||
};
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.submodules.games;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.submodules.games = with types; {
|
||||
enable = mkBoolOpt false "Whether or not you want to enable steam and other games";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
prismlauncher
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ prismlauncher ];
|
||||
|
||||
wyrdgard = {
|
||||
apps = {
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.submodules.socials;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.submodules.socials = with types; {
|
||||
enable = mkBoolOpt false "Whether to enable social apps";
|
||||
};
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.boot;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.boot = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable booting.";
|
||||
};
|
||||
|
|
|
@ -6,12 +6,14 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.fonts;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.fonts = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to manage fonts.";
|
||||
fonts = mkOpt (listOf package) [] "Custom font packages to install.";
|
||||
fonts = mkOpt (listOf package) [ ] "Custom font packages to install.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
@ -20,13 +22,17 @@ in {
|
|||
LOG_ICONS = "true";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
font-manager
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ font-manager ];
|
||||
|
||||
fonts.packages = with pkgs;
|
||||
fonts.packages =
|
||||
with pkgs;
|
||||
[
|
||||
(nerdfonts.override {fonts = ["CodeNewRoman" "NerdFontsSymbolsOnly"];})
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"CodeNewRoman"
|
||||
"NerdFontsSymbolsOnly"
|
||||
];
|
||||
})
|
||||
font-awesome
|
||||
powerline-fonts
|
||||
powerline-symbols
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.hardware.audio;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.hardware.audio = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable audio";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
noisetorch
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ noisetorch ];
|
||||
|
||||
programs.noisetorch.enable = true;
|
||||
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.hardware.bluetooth;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.hardware.bluetooth = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable bluetooth";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
libsForQt5.bluez-qt
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ libsForQt5.bluez-qt ];
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
|
@ -31,7 +31,11 @@ in {
|
|||
|
||||
fileSystems."/var/lib/bluetooth" = {
|
||||
device = "/persist/var/lib/bluetooth";
|
||||
options = ["bind" "noauto" "x-systemd.automount"];
|
||||
options = [
|
||||
"bind"
|
||||
"noauto"
|
||||
"x-systemd.automount"
|
||||
];
|
||||
noCheck = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.hardware.gpu.nvidia;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.hardware.gpu.nvidia = with types; {
|
||||
enable = mkEnableOption "Enable Nvidia GPU";
|
||||
};
|
||||
|
@ -29,7 +31,7 @@ in {
|
|||
package = config.boot.kernelPackages.nvidiaPackages.beta; # stable, beta
|
||||
};
|
||||
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.hardware.networking;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.hardware.networking = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable networking";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.networkmanager.enable = true;
|
||||
};
|
||||
config = mkIf cfg.enable { networking.networkmanager.enable = true; };
|
||||
}
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.locale;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.locale = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to manage locale settings.";
|
||||
};
|
||||
|
|
|
@ -6,15 +6,14 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.time;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.time = with types; {
|
||||
enable =
|
||||
mkBoolOpt false "Whether or not to configure timezone information.";
|
||||
enable = mkBoolOpt false "Whether or not to configure timezone information.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
time.timeZone = "Europe/Berlin";
|
||||
};
|
||||
config = mkIf cfg.enable { time.timeZone = "Europe/Berlin"; };
|
||||
}
|
||||
|
|
|
@ -5,9 +5,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.system.xkb;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.system.xkb = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to configure xkb.";
|
||||
};
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.tools.direnv;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.tools.direnv = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable direnv.";
|
||||
};
|
||||
|
|
|
@ -6,10 +6,12 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.tools.git;
|
||||
user = config.wyrdgard.user;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.tools.git = with types; {
|
||||
enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
|
||||
userName = mkOpt types.str user.fullName "The name to use git with";
|
||||
|
@ -26,9 +28,15 @@ in {
|
|||
enable = true;
|
||||
lfs.enable = true;
|
||||
config = {
|
||||
init = {defaultBranch = "main";};
|
||||
pull = {rebase = false;};
|
||||
push = {autoSetupRemote = true;};
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
pull = {
|
||||
rebase = false;
|
||||
};
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.tools.nix-ld;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.tools.nix-ld = with types; {
|
||||
enable = mkBoolOpt false "Wether or not to enable nix-ld";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.nix-ld.enable = true;
|
||||
};
|
||||
config = mkIf cfg.enable { programs.nix-ld.enable = true; };
|
||||
}
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; let
|
||||
with lib.wyrdgard;
|
||||
let
|
||||
cfg = config.wyrdgard.user;
|
||||
defaultIconFileName = "profile.png";
|
||||
defaultIcon = pkgs.stdenvNoCC.mkDerivation {
|
||||
|
@ -19,37 +20,37 @@ with lib.wyrdgard; let
|
|||
cp $src $out
|
||||
'';
|
||||
|
||||
passthru = {fileName = defaultIconFileName;};
|
||||
passthru = {
|
||||
fileName = defaultIconFileName;
|
||||
};
|
||||
};
|
||||
propagatedIcon =
|
||||
pkgs.runCommandNoCC "propagated-icon"
|
||||
{passthru = {fileName = cfg.icon.fileName;};}
|
||||
{
|
||||
passthru = {
|
||||
fileName = cfg.icon.fileName;
|
||||
};
|
||||
}
|
||||
''
|
||||
local target="$out/share/wyrdgard-icons/user/${cfg.name}"
|
||||
mkdir -p "$target"
|
||||
|
||||
cp ${cfg.icon} "$target/${cfg.icon.fileName}"
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.wyrdgard.user = with types; {
|
||||
name = mkOpt str "cholli" "The name to use for the user account.";
|
||||
fullName = mkOpt str "Christoph Hollizeck" "The full name of the user.";
|
||||
email = mkOpt str "christoph.hollizeck@hey.com" "The email of the user.";
|
||||
initialPassword =
|
||||
mkOpt str "asdf"
|
||||
"The initial password to use when the user is first created.";
|
||||
icon =
|
||||
mkOpt (nullOr package) defaultIcon
|
||||
"The profile picture to use for the user.";
|
||||
extraGroups = mkOpt (listOf str) [] "Groups for the user to be assigned.";
|
||||
extraOptions =
|
||||
mkOpt attrs {}
|
||||
(mdDoc "Extra options passed to `users.users.<name>`.");
|
||||
initialPassword = mkOpt str "asdf" "The initial password to use when the user is first created.";
|
||||
icon = mkOpt (nullOr package) defaultIcon "The profile picture to use for the user.";
|
||||
extraGroups = mkOpt (listOf str) [ ] "Groups for the user to be assigned.";
|
||||
extraOptions = mkOpt attrs { } (mdDoc "Extra options passed to `users.users.<name>`.");
|
||||
};
|
||||
|
||||
config = {
|
||||
environment.systemPackages = with pkgs; [
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ ];
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
|
@ -67,15 +68,11 @@ in {
|
|||
"Videos/.keep".text = "";
|
||||
"projects/.keep".text = "";
|
||||
".face".source = cfg.icon;
|
||||
"Pictures/${
|
||||
cfg.icon.fileName or (builtins.baseNameOf cfg.icon)
|
||||
}".source =
|
||||
cfg.icon;
|
||||
"Pictures/${cfg.icon.fileName or (builtins.baseNameOf cfg.icon)}".source = cfg.icon;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.${cfg.name} =
|
||||
{
|
||||
users.users.${cfg.name} = {
|
||||
isNormalUser = true;
|
||||
|
||||
inherit (cfg) name initialPassword;
|
||||
|
@ -92,8 +89,7 @@ in {
|
|||
# system to select).
|
||||
uid = 1000;
|
||||
|
||||
extraGroups = ["steamcmd"] ++ cfg.extraGroups;
|
||||
}
|
||||
// cfg.extraOptions;
|
||||
extraGroups = [ "steamcmd" ] ++ cfg.extraGroups;
|
||||
} // cfg.extraOptions;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ channels, inputs, ... }:
|
||||
{ channels, ... }:
|
||||
|
||||
final: prev: {
|
||||
vivaldi = prev.vivaldi.override { commandLineArgs = "--disable-features=AllowQt"; };
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; {
|
||||
imports = [./hardware.nix];
|
||||
with lib.wyrdgard;
|
||||
{
|
||||
imports = [ ./hardware.nix ];
|
||||
|
||||
boot.blacklistedKernelModules = ["hyperv-fb"];
|
||||
boot.blacklistedKernelModules = [ "hyperv-fb" ];
|
||||
virtualisation.hypervGuest.videoMode = "1920x1080";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ ];
|
||||
|
||||
environment.variables.EDITOR = "nvim";
|
||||
environment.variables.SUDOEDITOR = "nvim";
|
||||
|
|
|
@ -7,13 +7,17 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [];
|
||||
}:
|
||||
{
|
||||
imports = [ ];
|
||||
|
||||
boot.initrd.availableKernelModules = ["sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c58c66b3-4e0f-4393-8d7b-871d934856e3";
|
||||
|
@ -25,7 +29,7 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.wyrdgard; {
|
||||
imports = [./hardware.nix];
|
||||
with lib.wyrdgard;
|
||||
{
|
||||
imports = [ ./hardware.nix ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ ];
|
||||
|
||||
environment.pathsToLink = ["/libexec"];
|
||||
environment.pathsToLink = [ "/libexec" ];
|
||||
|
||||
wyrdgard = {
|
||||
archetypes = {
|
||||
|
|
|
@ -7,15 +7,24 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd" "btusb"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [
|
||||
"kvm-amd"
|
||||
"btusb"
|
||||
];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b";
|
||||
|
@ -27,7 +36,7 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
Loading…
Reference in a new issue