mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-16 18:15:13 -05:00
feat: added user2 and refactored to accommodate
This commit is contained in:
parent
c169f84dcc
commit
9cdcf4fec4
97 changed files with 1473 additions and 1052 deletions
|
@ -12,9 +12,6 @@ let
|
|||
attrList = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
};
|
||||
boolType = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
numOptions = 20;
|
||||
|
||||
|
@ -87,7 +84,7 @@ let
|
|||
ip = genOptions stringType "address";
|
||||
label = stringType;
|
||||
name = stringType;
|
||||
sync = stringType;
|
||||
sync = genOptions stringType "address";
|
||||
}
|
||||
// genOptions mountConfig "folder"
|
||||
// genOptions mountConfig "samba"
|
||||
|
@ -96,14 +93,14 @@ let
|
|||
|
||||
themesSubmodule = lib.types.submodule {
|
||||
options = {
|
||||
currentTheme = stringType;
|
||||
font = {
|
||||
name = stringType;
|
||||
size = {
|
||||
applications = intType;
|
||||
desktop = intType;
|
||||
popups = intType;
|
||||
terminal = intType;
|
||||
currentThemes = genOptions stringType "theme";
|
||||
fonts = {
|
||||
names = genOptions stringType "name";
|
||||
sizes = {
|
||||
applications = genOptions intType "size";
|
||||
desktop = genOptions intType "size";
|
||||
popups = genOptions intType "size";
|
||||
terminal = genOptions intType "size";
|
||||
};
|
||||
};
|
||||
cursor = {
|
||||
|
|
|
@ -1,13 +1,16 @@
|
|||
{devicesFunctions}: let
|
||||
inherit
|
||||
(devicesFunctions)
|
||||
{ devicesFunctions }:
|
||||
let
|
||||
inherit (devicesFunctions)
|
||||
ownerWriteOthersReadMask
|
||||
readWritePermissions
|
||||
;
|
||||
in {
|
||||
in
|
||||
{
|
||||
label = "Desktop";
|
||||
name = "desktop";
|
||||
sync = "";
|
||||
sync = {
|
||||
address0 = "";
|
||||
};
|
||||
ip = {
|
||||
address0 = "192.168.50.196";
|
||||
};
|
||||
|
|
32
config/devices/config/fallaryn.nix
Normal file
32
config/devices/config/fallaryn.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ devicesFunctions }:
|
||||
let
|
||||
inherit (devicesFunctions)
|
||||
readWritePermissions
|
||||
;
|
||||
drivePath = "/run/media";
|
||||
byLabel = "/dev/disk/by-label";
|
||||
|
||||
in
|
||||
{
|
||||
label = "Fallaryn";
|
||||
name = "fallaryn";
|
||||
ip = {
|
||||
address0 = "192.168.58.104";
|
||||
};
|
||||
boot = {
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
storage0 = {
|
||||
mount = "${drivePath}/games";
|
||||
device = "${byLabel}/Games";
|
||||
options = readWritePermissions;
|
||||
};
|
||||
storage1 = {
|
||||
mount = "${drivePath}/entertainment";
|
||||
device = "${byLabel}/Entertainment";
|
||||
options = readWritePermissions;
|
||||
};
|
||||
}
|
|
@ -1,12 +1,15 @@
|
|||
{devicesFunctions}: let
|
||||
inherit
|
||||
(devicesFunctions)
|
||||
{ devicesFunctions }:
|
||||
let
|
||||
inherit (devicesFunctions)
|
||||
ownerWriteOthersReadMask
|
||||
;
|
||||
in {
|
||||
in
|
||||
{
|
||||
label = "Laptop";
|
||||
name = "laptop";
|
||||
sync = "";
|
||||
sync = {
|
||||
address0 = "";
|
||||
};
|
||||
ip = {
|
||||
address0 = "192.168.50.142";
|
||||
};
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
{devicesFunctions}: let
|
||||
inherit
|
||||
(devicesFunctions)
|
||||
{ devicesFunctions }:
|
||||
let
|
||||
inherit (devicesFunctions)
|
||||
dummy
|
||||
;
|
||||
in {
|
||||
in
|
||||
{
|
||||
name = "pixel";
|
||||
label = dummy;
|
||||
sync = "RMDKNJY-BTX6FYF-G6SR332-WS6HARI-PF74SC6-VPBSGRQ-MKVQZEQ-KSIB6QV";
|
||||
sync = {
|
||||
address0 = "RMDKNJY-BTX6FYF-G6SR332-WS6HARI-PF74SC6-VPBSGRQ-MKVQZEQ-KSIB6QV"; # User0
|
||||
address1 = "RUKSHY4-UCBYRVG-CVYFCMU-M3NLA3Q-JINRF5V-YPR5W32-TEIBJN6-DNQRCAR"; # User2
|
||||
};
|
||||
ip = {
|
||||
address0 = "192.168.50.243";
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{devicesFunctions}: let
|
||||
inherit
|
||||
(devicesFunctions)
|
||||
{ devicesFunctions }:
|
||||
let
|
||||
inherit (devicesFunctions)
|
||||
fileModeAndDirMode
|
||||
ownerExclusiveReadWriteMask
|
||||
readWritePermissions
|
||||
|
@ -10,9 +10,13 @@
|
|||
serverName = "server";
|
||||
serverIP = "192.168.50.140";
|
||||
serverStorageDriveName = "NAS1";
|
||||
in {
|
||||
in
|
||||
{
|
||||
label = "Server";
|
||||
name = serverName;
|
||||
sync = {
|
||||
address0 = "";
|
||||
};
|
||||
ip = {
|
||||
address0 = serverIP;
|
||||
};
|
||||
|
|
|
@ -15,7 +15,10 @@ let
|
|||
in
|
||||
{
|
||||
label = "Synology";
|
||||
sync = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX";
|
||||
sync = {
|
||||
address0 = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX"; # User0
|
||||
address1 = ""; # User2
|
||||
};
|
||||
name = synologyName;
|
||||
ip = {
|
||||
address0 = synologyIP;
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
{devicesFunctions}: let
|
||||
inherit
|
||||
(devicesFunctions)
|
||||
{ devicesFunctions }:
|
||||
let
|
||||
inherit (devicesFunctions)
|
||||
dummy
|
||||
;
|
||||
in {
|
||||
in
|
||||
{
|
||||
name = "tablet";
|
||||
label = dummy;
|
||||
sync = "I2ZSCZU-T4JMUJJ-XCUQ3MY-G5EUFZ5-KRG2DRY-XIBJZZM-FQW3UMY-CBCTUQU";
|
||||
sync = {
|
||||
address0 = "I2ZSCZU-T4JMUJJ-XCUQ3MY-G5EUFZ5-KRG2DRY-XIBJZZM-FQW3UMY-CBCTUQU";
|
||||
};
|
||||
ip = {
|
||||
address0 = "192.168.50.189";
|
||||
};
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
let
|
||||
currentTheme = catppuccin-mocha;
|
||||
currentTheme0 = catppuccin-mocha;
|
||||
currentTheme1 = catppuccin-macchiato;
|
||||
|
||||
brogrammer = "brogrammer";
|
||||
catppuccin-frappe = "catppuccin-frappe";
|
||||
|
@ -22,20 +23,35 @@ let
|
|||
in
|
||||
{
|
||||
themes = {
|
||||
currentTheme = currentTheme;
|
||||
currentThemes = {
|
||||
theme0 = currentTheme0;
|
||||
};
|
||||
cursor = {
|
||||
name = "";
|
||||
size = 18;
|
||||
};
|
||||
font = {
|
||||
name = "MonaspiceRn Nerd Font";
|
||||
size = {
|
||||
|
||||
applications = 14;
|
||||
desktop = 12;
|
||||
popups = 10;
|
||||
terminal = 10;
|
||||
|
||||
fonts = {
|
||||
names = {
|
||||
name0 = "MonaspiceRn Nerd Font";
|
||||
name1 = "";
|
||||
};
|
||||
sizes = {
|
||||
applications = {
|
||||
size0 = 14;
|
||||
size1 = 14;
|
||||
};
|
||||
desktop = {
|
||||
size0 = 12;
|
||||
size1 = 12;
|
||||
};
|
||||
popups = {
|
||||
size0 = 10;
|
||||
size1 = 10;
|
||||
};
|
||||
terminal = {
|
||||
size0 = 10;
|
||||
size1 = 10;
|
||||
};
|
||||
};
|
||||
};
|
||||
palettes =
|
||||
|
|
19
config/users/config/user2.nix
Normal file
19
config/users/config/user2.nix
Normal file
|
@ -0,0 +1,19 @@
|
|||
{ user2 }:
|
||||
let
|
||||
inherit
|
||||
user2
|
||||
;
|
||||
in
|
||||
{
|
||||
name = "Stacie";
|
||||
email = {
|
||||
address0 = "staciesimonson@gmail.com";
|
||||
};
|
||||
paths = {
|
||||
path0 = "/home/${user2}"; # Git path
|
||||
};
|
||||
sshKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILQQDw0NigCC76G/GlHWIMunckaBmfgqbfJXFGWB+8fe stacie@desktop"
|
||||
];
|
||||
|
||||
}
|
|
@ -3,21 +3,17 @@ let
|
|||
|
||||
user0 = "nick";
|
||||
user1 = "garnet";
|
||||
in {
|
||||
user2 = "fallaryn";
|
||||
in
|
||||
{
|
||||
inherit
|
||||
user0
|
||||
user1
|
||||
user2
|
||||
;
|
||||
users = {
|
||||
"${user0}" = import (configPath + "/user0.nix") {
|
||||
inherit
|
||||
user0
|
||||
;
|
||||
};
|
||||
"${user1}" = import (configPath + "/user1.nix") {
|
||||
inherit
|
||||
user1
|
||||
;
|
||||
};
|
||||
"${user0}" = import (configPath + /user0.nix) { inherit user0; };
|
||||
"${user1}" = import (configPath + /user1.nix) { inherit user1; };
|
||||
"${user2}" = import (configPath + /user2.nix) { inherit user2; };
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue