gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

project-wide: Fixing refactor issues

Browse source
This commit is contained in:
kat witch 2021-03-28 21:12:37 +01:00
parent f92e21126e
commit d8dcfada4f
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
9 changed files with 41 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

27
nixos.nix
View file

@ -9,6 +9,17 @@
./private/profile/nixos
];
options = {
deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
deploy.profile.gui = lib.mkEnableOption "graphical system" // {
default = true;
};
deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
default = true;
};
};
options.home-manager.users = lib.mkOption {
type = lib.types.attrsOf (lib.types.submoduleWith {
modules = [ ];
@ -22,12 +33,28 @@
config = {
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
users = {
kat = {
imports = [ ./home.nix (import (./hosts + "/${hostName}/home")) ];
options = {
deploy.profile.kat = lib.mkEnableOption "uhh meow" // {
default = true;
};
deploy.profile.gui = lib.mkEnableOption "graphical system" // {
default = true;
};
deploy.profile.sway = lib.mkEnableOption "sway wm" // {
default = true;
};
deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
default = true;
};
};
};
};
};

6
profiles/gui/home.nix
View file

@ -2,10 +2,4 @@
{
imports = [ ./home ];
options = {
deploy.profile.gui = lib.mkEnableOption "graphical system" // {
default = true;
};
};
}

8
profiles/gui/nixos.nix
View file

@ -3,11 +3,5 @@
{
imports = [ ./nixos ];
options = {
deploy.profile.gui = lib.mkEnableOption "graphical system" // {
default = true;
};
};
config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
home-manager.users.kat = { imports = [ ./home.nix ]; };
}

9
profiles/kat/home.nix
View file

@ -2,13 +2,4 @@
{
imports = [ ./home ];
#home-manager.useGlobalPkgs = true;
#home-manager.users.kat = {
# imports = [ ../../../modules/home ];
#};
options = {
deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
};
}

29
profiles/kat/nixos.nix
View file

@ -1,24 +1,17 @@
{ config, pkgs, lib, ... }:
{
config = {
home-manager.users.kat = { imports = [ ./home.nix ]; };
home-manager.users.kat = { imports = [ ./home.nix ]; };
users.users.kat = {
uid = 1000;
isNormalUser = true;
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454"
];
shell = pkgs.zsh;
extraGroups = [ "wheel" "video" ];
hashedPassword =
"$6$i28yOXoo$/WokLdKds5ZHtJHcuyGrH2WaDQQk/2Pj0xRGLgS8UcmY2oMv3fw2j/85PRpsJJwCB2GBRYRK5LlvdTleHd3mB.";
};
users.users.kat = {
uid = 1000;
isNormalUser = true;
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== cardno:000612078454"
];
shell = pkgs.zsh;
extraGroups = [ "wheel" "video" ];
hashedPassword =
"$6$i28yOXoo$/WokLdKds5ZHtJHcuyGrH2WaDQQk/2Pj0xRGLgS8UcmY2oMv3fw2j/85PRpsJJwCB2GBRYRK5LlvdTleHd3mB.";
};
options = {
deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
};
}

8
profiles/laptop/home.nix
View file

@ -1,9 +1,3 @@
{ lib, ... }:
{
options = {
deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
default = true;
};
};
}
{ }

8
profiles/laptop/nixos.nix
View file

@ -2,12 +2,4 @@
{
imports = [ ./nixos ];
options = {
deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
default = true;
};
};
config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
}

4
profiles/sway/home.nix
View file

@ -2,8 +2,4 @@
{
imports = [ ./home ];
options = {
deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
};
}

6
profiles/sway/nixos.nix
View file

@ -3,9 +3,5 @@
{
imports = [ ./nixos ];
options = {
deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
};
config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
home-manager.users.kat = { imports = [ ./home.nix ]; };
}