oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-06-11 04:30:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

so many tests

Browse Source
This commit is contained in:
Jor Oqyude
2025-08-04 21:39:24 +03:00
parent 704e704b4c
commit 56e97b6d5f
20 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/laptop.nix
+7 -9
View File
@@ -24,14 +24,12 @@ let
self.nixosModules.software.wine self.nixosModules.software.wine
self.nixosModules.software.beets self.nixosModules.software.beets
self.nixosModules.desktop self.nixosModules.desktop
self.homeConfigurations.main.nixosModule
self.homeConfigurations.root.nixosModule
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
] ]
++ builtins.attrValues inputs.self.nixosModules.extra.self; ++ builtins.attrValues inputs.self.nixosModules.extra.self;
fileSystems = { fileSystems = {
"${inputs.zeroq.dirs.therima-drive}" = { "${config.xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
fsType = "ntfs3"; fsType = "ntfs3";
options = [ options = [
@@ -44,7 +42,7 @@ let
#"x-systemd.device-timeout=0" #"x-systemd.device-timeout=0"
]; ];
}; };
"${inputs.zeroq.dirs.vetymae-drive}" = { "${config.xlib.dirs.vetymae-drive}" = {
device = "/dev/disk/by-uuid/6E04EA7F04EA49A3"; device = "/dev/disk/by-uuid/6E04EA7F04EA49A3";
fsType = "ntfs3"; fsType = "ntfs3";
options = [ options = [
@@ -58,7 +56,7 @@ let
]; ];
}; };
"/mnt/beets/music" = { "/mnt/beets/music" = {
device = "/home/${inputs.zeroq.devices.admin}/Music"; # "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Music" device = "/home/${config.xlib.devices.admin}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [ options = [
"bind" "bind"
#"uid=1000" #"uid=1000"
@@ -108,7 +106,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
networking = { networking = {
hostName = "${inputs.zeroq.devices.laptop.hostname}"; hostName = "${config.xlib.devices.laptop.hostname}";
networkmanager.enable = true; networkmanager.enable = true;
firewall.enable = false; firewall.enable = false;
}; };
@@ -137,10 +135,10 @@ let
syncthing = { syncthing = {
enable = true; enable = true;
systemService = true; systemService = true;
configDir = "${inputs.zeroq.dirs.user-storage}/Syncthing/${config.system.name}"; # ${inputs.zeroq.devices.laptop.hostname} configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
dataDir = "${inputs.zeroq.dirs.user-home}"; dataDir = "${config.xlib.dirs.user-home}";
group = "users"; group = "users";
user = "${inputs.zeroq.devices.admin}"; user = "${config.xlib.devices.admin}";
}; };
pipewire = { pipewire = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
devices/mini-pc.nix
+10 -9
View File
@@ -24,8 +24,9 @@ let
self.nixosModules.software.beets self.nixosModules.software.beets
#self.nixosModules.extra.self.fingerprint #self.nixosModules.extra.self.fingerprint
self.nixosModules.desktop self.nixosModules.desktop
self.homeConfigurations.main.nixosModule self.homeConfigurations.default.nixosModule
self.homeConfigurations.root.nixosModule # self.homeConfigurations.main.nixosModule
# self.homeConfigurations.root.nixosModule
]; ];
sops = { sops = {
@@ -34,7 +35,7 @@ let
}; };
fileSystems = { fileSystems = {
"${inputs.zeroq.dirs.therima-drive}" = { "${config.xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
fsType = "ntfs3"; fsType = "ntfs3";
options = [ options = [
@@ -47,7 +48,7 @@ let
#"x-systemd.device-timeout=0" #"x-systemd.device-timeout=0"
]; ];
}; };
"${inputs.zeroq.dirs.vetymae-drive}" = { "${config.xlib.dirs.vetymae-drive}" = {
device = "/dev/disk/by-uuid/38D63C6ED63C2E8E"; device = "/dev/disk/by-uuid/38D63C6ED63C2E8E";
fsType = "ntfs3"; fsType = "ntfs3";
options = [ options = [
@@ -61,7 +62,7 @@ let
]; ];
}; };
"/mnt/beets/music" = { "/mnt/beets/music" = {
device = "/home/${inputs.zeroq.devices.admin}/Music"; # "${inputs.zeroq.dirs.vetymae-drive}/Users/User/Music" device = "/home/${config.xlib.devices.admin}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [ options = [
"bind" "bind"
#"uid=1000" #"uid=1000"
@@ -93,7 +94,7 @@ let
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
networking = { networking = {
hostName = "${inputs.zeroq.devices.laptop.hostname}"; hostName = "${config.xlib.devices.laptop.hostname}";
networkmanager.enable = true; networkmanager.enable = true;
firewall.enable = false; firewall.enable = false;
}; };
@@ -123,10 +124,10 @@ let
syncthing = { syncthing = {
enable = true; enable = true;
systemService = true; systemService = true;
configDir = "${inputs.zeroq.dirs.user-storage}/Syncthing/${config.system.name}"; # ${inputs.zeroq.devices.laptop.hostname} configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
dataDir = "${inputs.zeroq.dirs.user-home}"; dataDir = "${config.xlib.dirs.user-home}";
group = "users"; group = "users";
user = "${inputs.zeroq.devices.admin}"; user = "${config.xlib.devices.admin}";
}; };
pipewire = { pipewire = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
devices/server.nix
+20 -20
View File
@@ -43,7 +43,7 @@ let
users = { users = {
users = { users = {
"${inputs.zeroq.devices.admin}" = { "${config.xlib.devices.admin}" = {
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P root@sapphira" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P root@sapphira"
]; ];
@@ -53,7 +53,7 @@ let
fileSystems = { fileSystems = {
# External drive # External drive
"${inputs.zeroq.dirs.server-home}" = { "${config.xlib.dirs.server-home}" = {
device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de"; device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de";
fsType = "ext4"; fsType = "ext4";
options = [ options = [
@@ -74,7 +74,7 @@ let
}; };
# beets # beets
"/mnt/beets/music" = { "/mnt/beets/music" = {
device = "${inputs.zeroq.dirs.server-home}/Music"; device = "${config.xlib.dirs.server-home}/Music";
options = [ options = [
"bind" "bind"
"uid=1000" "uid=1000"
@@ -110,19 +110,19 @@ let
"path" = "/etc/nixos"; "path" = "/etc/nixos";
"browseable" = "yes"; "browseable" = "yes";
"read only" = "no"; "read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}"; "valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no"; "guest ok" = "no";
"writable" = "yes"; "writable" = "yes";
"create mask" = 755; "create mask" = 755;
"directory mask" = 755; "directory mask" = 755;
"force user" = "${inputs.zeroq.devices.admin}"; "force user" = "${config.xlib.devices.admin}";
"force group" = "users"; "force group" = "users";
}; };
root = { root = {
"path" = "/"; "path" = "/";
"browseable" = "yes"; "browseable" = "yes";
"read only" = "no"; "read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}"; "valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no"; "guest ok" = "no";
"writable" = "yes"; "writable" = "yes";
#"create mask" = 0644; #"create mask" = 0644;
@@ -130,16 +130,16 @@ let
"force user" = "root"; "force user" = "root";
"force group" = "root"; "force group" = "root";
}; };
"${inputs.zeroq.devices.admin}" = { "${config.xlib.devices.admin}" = {
"path" = "${inputs.zeroq.dirs.server-home}"; "path" = "${config.xlib.dirs.server-home}";
"browseable" = "yes"; "browseable" = "yes";
"read only" = "no"; "read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}"; "valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no"; "guest ok" = "no";
"writable" = "yes"; "writable" = "yes";
"create mask" = 700; "create mask" = 700;
"directory mask" = 700; "directory mask" = 700;
"force user" = "${inputs.zeroq.devices.admin}"; "force user" = "${config.xlib.devices.admin}";
"force group" = "users"; "force group" = "users";
}; };
}; };
@@ -147,9 +147,9 @@ let
calibre-web = { calibre-web = {
enable = true; enable = true;
group = "users"; group = "users";
user = "${inputs.zeroq.devices.admin}"; user = "${config.xlib.devices.admin}";
options = { options = {
calibreLibrary = "${inputs.zeroq.dirs.calibre-library}"; calibreLibrary = "${config.xlib.dirs.calibre-library}";
enableBookUploading = true; enableBookUploading = true;
enableKepubify = false; enableKepubify = false;
}; };
@@ -174,14 +174,14 @@ let
}; };
transmission = { transmission = {
enable = false; enable = false;
credentialsFile = "${inputs.zeroq.dirs.server-home}/server/transmission/settings.json"; credentialsFile = "${config.xlib.dirs.server-home}/server/transmission/settings.json";
openRPCPort = true; openRPCPort = true;
package = pkgs.transmission_4; package = pkgs.transmission_4;
user = "${inputs.zeroq.devices.admin}"; user = "${config.xlib.devices.admin}";
group = "users"; group = "users";
settings = { settings = {
download-dir = "${inputs.zeroq.dirs.server-home}/Downloads"; download-dir = "${config.xlib.dirs.server-home}/Downloads";
incomplete-dir = "${inputs.zeroq.dirs.server-home}/Downloads/Temp"; incomplete-dir = "${config.xlib.dirs.server-home}/Downloads/Temp";
incomplete-dir-enabled = true; incomplete-dir-enabled = true;
rpc-bind-address = "0.0.0.0"; rpc-bind-address = "0.0.0.0";
rpc-port = 9091; rpc-port = 9091;
@@ -193,16 +193,16 @@ let
enable = true; enable = true;
systemService = true; systemService = true;
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
configDir = "${inputs.zeroq.dirs.storage}/Syncthing/${inputs.zeroq.devices.server.hostname}"; configDir = "${config.xlib.dirs.storage}/Syncthing/${config.xlib.devices.server.hostname}";
dataDir = "${inputs.zeroq.dirs.server-home}"; dataDir = "${config.xlib.dirs.server-home}";
group = "users"; group = "users";
user = "${inputs.zeroq.devices.admin}"; user = "${config.xlib.devices.admin}";
}; };
tailscale.enable = true; tailscale.enable = true;
}; };
networking = { networking = {
hostName = "${inputs.zeroq.devices.server.hostname}"; hostName = "${config.xlib.devices.server.hostname}";
networkmanager.enable = true; networkmanager.enable = true;
firewall.enable = false; firewall.enable = false;
}; };
devices/vds.nix
+9 -9
View File
@@ -52,7 +52,7 @@ let
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
]; ];
}; };
"${inputs.zeroq.devices.admin}" = { "${config.xlib.devices.admin}" = {
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P"
]; ];
@@ -81,19 +81,19 @@ let
"path" = "/etc/nixos"; "path" = "/etc/nixos";
"browseable" = "yes"; "browseable" = "yes";
"read only" = "no"; "read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}"; "valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no"; "guest ok" = "no";
"writable" = "yes"; "writable" = "yes";
"create mask" = 755; "create mask" = 755;
"directory mask" = 755; "directory mask" = 755;
"force user" = "${inputs.zeroq.devices.admin}"; "force user" = "${config.xlib.devices.admin}";
"force group" = "users"; "force group" = "users";
}; };
root = { root = {
"path" = "/"; "path" = "/";
"browseable" = "yes"; "browseable" = "yes";
"read only" = "no"; "read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}"; "valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no"; "guest ok" = "no";
"writable" = "yes"; "writable" = "yes";
#"create mask" = 0644; #"create mask" = 0644;
@@ -101,16 +101,16 @@ let
"force user" = "root"; "force user" = "root";
"force group" = "root"; "force group" = "root";
}; };
"${inputs.zeroq.devices.admin}" = { "${config.xlib.devices.admin}" = {
"path" = "/home/${inputs.zeroq.devices.admin}"; "path" = "/home/${config.xlib.devices.admin}";
"browseable" = "yes"; "browseable" = "yes";
"read only" = "no"; "read only" = "no";
"valid users" = "${inputs.zeroq.devices.admin}"; "valid users" = "${config.xlib.devices.admin}";
"guest ok" = "no"; "guest ok" = "no";
"writable" = "yes"; "writable" = "yes";
"create mask" = 700; "create mask" = 700;
"directory mask" = 700; "directory mask" = 700;
"force user" = "${inputs.zeroq.devices.admin}"; "force user" = "${config.xlib.devices.admin}";
"force group" = "users"; "force group" = "users";
}; };
}; };
@@ -138,7 +138,7 @@ let
}; };
networking = { networking = {
hostName = "${inputs.zeroq.devices.vds.hostname}"; hostName = "${config.xlib.devices.vds.hostname}";
networkmanager.enable = true; networkmanager.enable = true;
firewall.enable = true; firewall.enable = true;
}; };
devices/wsl.nix
+2 -2
View File
@@ -37,7 +37,7 @@ let
fileSystems = { fileSystems = {
# beets # beets
"/mnt/beets/music" = { "/mnt/beets/music" = {
device = "${inputs.zeroq.dirs.wsl-home}/Music"; device = "${config.xlib.dirs.wsl-home}/Music";
options = [ options = [
"bind" "bind"
"uid=1000" "uid=1000"
@@ -62,7 +62,7 @@ let
networking = { networking = {
firewall.enable = false; firewall.enable = false;
hostName = "${config.xlib.device.hostname}"; hostName = config.xlib.device.hostname;
}; };
wsl = { wsl = {
flake.nix
+10 -10
View File
@@ -144,18 +144,18 @@
homeConfigurations = { homeConfigurations = {
default = import ./home/default.nix flakeContext; default = import ./home/default.nix flakeContext;
root = import ./home/root.nix flakeContext; # root = import ./home/root.nix flakeContext;
main = import ./home/main.nix flakeContext; # main = import ./home/main.nix flakeContext;
server = import ./home/server.nix flakeContext; # server = import ./home/server.nix flakeContext;
wsl = import ./home/wsl.nix flakeContext; # wsl = import ./home/wsl.nix flakeContext;
}; };
homeModules = { homeModules = {
minimal = import ./home/modules/minimal.nix flakeContext; # minimal = import ./home/modules/minimal.nix flakeContext;
wsl = import ./home/modules/wsl.nix flakeContext; # wsl = import ./home/modules/wsl.nix flakeContext;
packages = import ./home/modules/packages.nix flakeContext; # packages = import ./home/modules/packages.nix flakeContext;
default = import ./home/modules/default.nix flakeContext; # default = import ./home/modules/default.nix flakeContext;
dconf = import ./home/modules/dconf.nix flakeContext; # dconf = import ./home/modules/dconf.nix flakeContext;
plasma-manager = import ./home/modules/plasma-manager.nix flakeContext; # plasma-manager = import ./home/modules/plasma-manager.nix flakeContext;
}; };
}; };
} }
home/default.nix
+4 -2
View File
@@ -10,7 +10,8 @@ let
}: }:
{ {
imports = [ imports = [
inputs.self.homeModules."${xlib.device.type}" # -> (./type + "/${xlib.device.type}.nix") (./type + "/${xlib.device.type}.nix")
#inputs.self.homeModules."${xlib.device.type}" # -> (./type + "/${xlib.device.type}.nix")
]; ];
home = { home = {
username = xlib.device.username; username = xlib.device.username;
@@ -29,7 +30,8 @@ let
}: }:
{ {
imports = [ imports = [
inputs.self.homeModules."${xlib.device.type}" (./type + "/${xlib.device.type}.nix")
#inputs.self.homeModules."${xlib.device.type}"
]; ];
home = { home = {
username = "root"; username = "root";
home/main.nix
+12 -12
View File
@@ -14,33 +14,33 @@ let
autostart.enable = true; autostart.enable = true;
configFile = { configFile = {
"beets" = { "beets" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/beets/linux"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/beets/linux";
target = "beets"; target = "beets";
}; };
"ludusavi" = { "ludusavi" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/ludusavi/cfg"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/ludusavi/cfg";
target = "ludusavi"; target = "ludusavi";
}; };
"solaar" = { "solaar" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/solaar"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/solaar";
target = "solaar"; target = "solaar";
}; };
"easyeffects" = { "easyeffects" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/easyeffects"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/easyeffects";
target = "easyeffects"; target = "easyeffects";
}; };
"keepassxc" = { "keepassxc" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/KeePassXC"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/KeePassXC";
target = "keepassxc"; target = "keepassxc";
}; };
}; };
dataFile = { dataFile = {
"PrismLauncher" = { "PrismLauncher" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/Games/PrismLauncher"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.vetymae-drive}/Games/PrismLauncher";
target = "PrismLauncher"; target = "PrismLauncher";
}; };
"v2rayN" = { "v2rayN" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/v2rayN"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/v2rayN";
target = "v2rayN"; target = "v2rayN";
}; };
}; };
@@ -59,18 +59,18 @@ let
}; };
home = { home = {
username = "${inputs.zeroq.devices.admin}"; username = "${config.xlib.devices.admin}";
file = { file = {
"ssh" = { "ssh" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/ssh/${config.home.username}"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.user-storage}/ssh/${config.home.username}";
target = ".ssh"; target = ".ssh";
}; };
"External" = { "External" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.therima-drive}"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.therima-drive}";
target = "External"; target = "External";
}; };
"LM Studio" = { "LM Studio" = {
source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.vetymae-drive}/AI/LM Studio"; source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.vetymae-drive}/AI/LM Studio";
target = ".lmstudio"; target = ".lmstudio";
}; };
}; };
@@ -90,7 +90,7 @@ let
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.${inputs.zeroq.devices.admin} = homeModule; users.${config.xlib.devices.admin} = homeModule;
sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
extraSpecialArgs = { extraSpecialArgs = {
inherit (config.networking) hostName; inherit (config.networking) hostName;
home/modules/server.nix
+2 -2
View File
@@ -7,8 +7,8 @@
}: }:
let let
# Paths # Paths
beetsPath = "${inputs.zeroq.dirs.storage}/beets/linux"; beetsPath = "${config.xlib.dirs.storage}/beets/linux";
sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
in in
{ {
home/modules/wsl.nix
+4 -4
View File
@@ -6,10 +6,10 @@
}: }:
let let
# Paths # Paths
beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux"; beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; #sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${inputs.zeroq.dirs.wsl-home}"; externalPath = "${config.xlib.dirs.wsl-home}";
in in
{ {
imports = [ imports = [
@@ -38,7 +38,7 @@ in
# }; # };
}; };
home = { home = {
#username = "${inputs.zeroq.devices.admin}"; #username = "${config.xlib.devices.admin}";
file = { file = {
"External" = { "External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath; source = config.lib.file.mkOutOfStoreSymlink externalPath;
home/server.nix
+4 -4
View File
@@ -9,8 +9,8 @@ let
}: }:
let let
# Paths # Paths
beetsPath = "${inputs.zeroq.dirs.storage}/beets/linux"; beetsPath = "${config.xlib.dirs.storage}/beets/linux";
sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
in in
{ {
@@ -50,7 +50,7 @@ let
target = "${config.home.homeDirectory}/Music"; target = "${config.home.homeDirectory}/Music";
}; };
}; };
username = "${inputs.zeroq.devices.admin}"; username = "${config.xlib.devices.admin}";
}; };
}; };
@@ -60,7 +60,7 @@ let
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.${inputs.zeroq.devices.admin} = homeModule; users.${config.xlib.devices.admin} = homeModule;
sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
}; };
}; };
home/modules/minimal.nix → home/type/minimal.nix
View File
home/type/wsl.nix
+4 -6
View File
@@ -1,4 +1,3 @@
#{ inputs, ... }@flakeContext:
{ {
config, config,
pkgs, pkgs,
@@ -6,14 +5,14 @@
}: }:
let let
# Paths # Paths
beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux"; beetsPath = "${xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; #sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${inputs.zeroq.dirs.wsl-home}"; externalPath = "${xlib.dirs.wsl-home}";
in in
{ {
imports = [ imports = [
inputs.self.homeModules.minimal ./minimal.nix
]; ];
xdg = { xdg = {
enable = true; enable = true;
@@ -38,7 +37,6 @@ in
# }; # };
}; };
home = { home = {
#username = "${inputs.zeroq.devices.admin}";
file = { file = {
"External" = { "External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath; source = config.lib.file.mkOutOfStoreSymlink externalPath;
home/wsl.nix
+5 -5
View File
@@ -9,10 +9,10 @@ let
}: }:
let let
# Paths # Paths
beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux"; beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; #sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${inputs.zeroq.dirs.wsl-home}"; externalPath = "${config.xlib.dirs.wsl-home}";
in in
{ {
imports = [ imports = [
@@ -42,7 +42,7 @@ let
}; };
home = { home = {
#username = "${inputs.zeroq.devices.admin}"; #username = "${config.xlib.devices.admin}";
file = { file = {
"External" = { "External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath; source = config.lib.file.mkOutOfStoreSymlink externalPath;
@@ -69,7 +69,7 @@ let
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.${inputs.zeroq.devices.admin} = homeModule; users.${config.xlib.devices.admin} = homeModule;
# sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; # sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
# extraSpecialArgs = { # extraSpecialArgs = {
# inherit (config.networking) hostName; # inherit (config.networking) hostName;
modules/default.nix
+2 -1
View File
@@ -7,7 +7,8 @@
imports = with inputs; [ imports = with inputs; [
./essentials ./essentials
./users.nix ./users.nix
(import ./options.nix { inherit lib inputs; }) # Options ./options.nix
#(import ./options.nix { inherit lib inputs; }) # Options
home-manager.nixosModules.home-manager # home-manager module home-manager.nixosModules.home-manager # home-manager module
nix-index-database.nixosModules.nix-index # nix-index module nix-index-database.nixosModules.nix-index # nix-index module
modules/server/cloudflared.nix
+4 -4
View File
@@ -9,10 +9,10 @@
services = { services = {
cloudflared = { cloudflared = {
enable = false; enable = false;
certificateFile = "${inputs.zeroq.dirs.server-credentials}/cloudflared/cert.pem"; certificateFile = "${config.xlib.dirs.server-credentials}/cloudflared/cert.pem";
tunnels = { tunnels = {
"58b340ee-e98a-4af9-b786-74600c71f49e" = { "58b340ee-e98a-4af9-b786-74600c71f49e" = {
credentialsFile = "${inputs.zeroq.dirs.server-credentials}/cloudflared/server.json"; credentialsFile = "${config.xlib.dirs.server-credentials}/cloudflared/server.json";
warp-routing.enabled = true; warp-routing.enabled = true;
ingress = { ingress = {
"immich.zeroq.ru" = { "immich.zeroq.ru" = {
@@ -25,7 +25,7 @@
default = "http_status:404"; default = "http_status:404";
}; };
# "58b340ee-e98a-4af9-b786-74600c71f49e" = { # "58b340ee-e98a-4af9-b786-74600c71f49e" = {
# credentialsFile = "${inputs.zeroq.dirs.server-credentials}/cloudflared/server.json"; # credentialsFile = "${config.xlib.dirs.server-credentials}/cloudflared/server.json";
# warp-routing.enabled = true; # warp-routing.enabled = true;
# ingress = { # ingress = {
# "nextcloud.zeroq.ru" = { # "nextcloud.zeroq.ru" = {
@@ -57,7 +57,7 @@
# ]; # ];
# wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
# serviceConfig = { # serviceConfig = {
# ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate --config=${inputs.zeroq.dirs.server-credentials}/cloudflared/config.yaml --origincert=${inputs.zeroq.dirs.server-credentials}/cloudflared/cert.pem --credentials-file=${inputs.zeroq.dirs.server-credentials}/cloudflared/server.json run"; # ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate --config=${config.xlib.dirs.server-credentials}/cloudflared/config.yaml --origincert=${config.xlib.dirs.server-credentials}/cloudflared/cert.pem --credentials-file=${config.xlib.dirs.server-credentials}/cloudflared/server.json run";
# Group = "root"; # Group = "root";
# User = "root"; # User = "root";
# Restart = "on-failure"; # Restart = "on-failure";
modules/server/immich.nix
+1 -1
View File
@@ -20,7 +20,7 @@
}; };
fileSystems."${config.services.immich.mediaLocation}" = { fileSystems."${config.services.immich.mediaLocation}" = {
device = "${inputs.zeroq.dirs.immich-folder}"; device = "${config.xlib.dirs.immich-folder}";
options = [ options = [
"bind" "bind"
#"uid=1000" #"uid=1000"
modules/server/nextcloud.nix
+1 -1
View File
@@ -76,7 +76,7 @@
}; };
fileSystems."/mnt/nextcloud" = { fileSystems."/mnt/nextcloud" = {
device = "${inputs.zeroq.dirs.nextcloud-folder}"; device = "${config.xlib.dirs.nextcloud-folder}";
options = [ options = [
"bind" "bind"
#"uid=1000" #"uid=1000"
modules/software/ai.nix
+1 -1
View File
@@ -15,7 +15,7 @@
# HSA_OVERRIDE_GFX_VERSION = "11.5.0"; # HSA_OVERRIDE_GFX_VERSION = "11.5.0";
# HCC_AMDGPU_TARGET = "gfx1150"; # used to be necessary, but doesn't seem to anymore # HCC_AMDGPU_TARGET = "gfx1150"; # used to be necessary, but doesn't seem to anymore
# }; # };
# user = "ollama"; # "${inputs.zeroq.devices.admin}"; # user = "ollama"; # "${config.xlib.devices.admin}";
# group = "ollama"; # group = "ollama";
# acceleration = "rocm"; # acceleration = "rocm";
# rocmOverrideGfx = "11.5.0"; # rocmOverrideGfx = "11.5.0";
modules/software/beets/default.nix
+2 -2
View File
@@ -20,12 +20,12 @@ let
in in
{ {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"z /mnt/beets 0700 ${inputs.zeroq.devices.admin} users -" # beets absolute paths "z /mnt/beets 0700 ${config.xlib.devices.admin} users -" # beets absolute paths
]; ];
users = { users = {
users = { users = {
"${inputs.zeroq.devices.admin}" = { "${config.xlib.devices.admin}" = {
packages = [ packages = [
beetsEnv beetsEnv
pkgs.mp3gain pkgs.mp3gain