From 56e97b6d5f7e3fbe3a249685f318063d0e9cbfa8 Mon Sep 17 00:00:00 2001 From: oqyude Date: Mon, 4 Aug 2025 21:39:24 +0300 Subject: [PATCH] so many tests --- devices/laptop.nix | 16 ++++++------ devices/mini-pc.nix | 19 +++++++------- devices/server.nix | 40 +++++++++++++++--------------- devices/vds.nix | 18 +++++++------- devices/wsl.nix | 4 +-- flake.nix | 20 +++++++-------- home/default.nix | 6 +++-- home/main.nix | 24 +++++++++--------- home/modules/server.nix | 4 +-- home/modules/wsl.nix | 8 +++--- home/server.nix | 8 +++--- home/{modules => type}/minimal.nix | 0 home/type/wsl.nix | 10 +++----- home/wsl.nix | 10 ++++---- modules/default.nix | 3 ++- modules/server/cloudflared.nix | 8 +++--- modules/server/immich.nix | 2 +- modules/server/nextcloud.nix | 2 +- modules/software/ai.nix | 2 +- modules/software/beets/default.nix | 4 +-- 20 files changed, 104 insertions(+), 104 deletions(-) rename home/{modules => type}/minimal.nix (100%) diff --git a/devices/laptop.nix b/devices/laptop.nix index f58cfc9..4c196e3 100755 --- a/devices/laptop.nix +++ b/devices/laptop.nix @@ -24,14 +24,12 @@ let self.nixosModules.software.wine self.nixosModules.software.beets self.nixosModules.desktop - self.homeConfigurations.main.nixosModule - self.homeConfigurations.root.nixosModule sops-nix.nixosModules.sops ] ++ builtins.attrValues inputs.self.nixosModules.extra.self; fileSystems = { - "${inputs.zeroq.dirs.therima-drive}" = { + "${config.xlib.dirs.therima-drive}" = { device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; fsType = "ntfs3"; options = [ @@ -44,7 +42,7 @@ let #"x-systemd.device-timeout=0" ]; }; - "${inputs.zeroq.dirs.vetymae-drive}" = { + "${config.xlib.dirs.vetymae-drive}" = { device = "/dev/disk/by-uuid/6E04EA7F04EA49A3"; fsType = "ntfs3"; options = [ @@ -58,7 +56,7 @@ let ]; }; "/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 = [ "bind" #"uid=1000" @@ -108,7 +106,7 @@ let # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; networking = { - hostName = "${inputs.zeroq.devices.laptop.hostname}"; + hostName = "${config.xlib.devices.laptop.hostname}"; networkmanager.enable = true; firewall.enable = false; }; @@ -137,10 +135,10 @@ let syncthing = { enable = true; systemService = true; - configDir = "${inputs.zeroq.dirs.user-storage}/Syncthing/${config.system.name}"; # ${inputs.zeroq.devices.laptop.hostname} - dataDir = "${inputs.zeroq.dirs.user-home}"; + configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname} + dataDir = "${config.xlib.dirs.user-home}"; group = "users"; - user = "${inputs.zeroq.devices.admin}"; + user = "${config.xlib.devices.admin}"; }; pipewire = { enable = lib.mkDefault true; diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix index a816b2e..80e4ce2 100755 --- a/devices/mini-pc.nix +++ b/devices/mini-pc.nix @@ -24,8 +24,9 @@ let self.nixosModules.software.beets #self.nixosModules.extra.self.fingerprint self.nixosModules.desktop - self.homeConfigurations.main.nixosModule - self.homeConfigurations.root.nixosModule + self.homeConfigurations.default.nixosModule + # self.homeConfigurations.main.nixosModule + # self.homeConfigurations.root.nixosModule ]; sops = { @@ -34,7 +35,7 @@ let }; fileSystems = { - "${inputs.zeroq.dirs.therima-drive}" = { + "${config.xlib.dirs.therima-drive}" = { device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; fsType = "ntfs3"; options = [ @@ -47,7 +48,7 @@ let #"x-systemd.device-timeout=0" ]; }; - "${inputs.zeroq.dirs.vetymae-drive}" = { + "${config.xlib.dirs.vetymae-drive}" = { device = "/dev/disk/by-uuid/38D63C6ED63C2E8E"; fsType = "ntfs3"; options = [ @@ -61,7 +62,7 @@ let ]; }; "/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 = [ "bind" #"uid=1000" @@ -93,7 +94,7 @@ let # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; networking = { - hostName = "${inputs.zeroq.devices.laptop.hostname}"; + hostName = "${config.xlib.devices.laptop.hostname}"; networkmanager.enable = true; firewall.enable = false; }; @@ -123,10 +124,10 @@ let syncthing = { enable = true; systemService = true; - configDir = "${inputs.zeroq.dirs.user-storage}/Syncthing/${config.system.name}"; # ${inputs.zeroq.devices.laptop.hostname} - dataDir = "${inputs.zeroq.dirs.user-home}"; + configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname} + dataDir = "${config.xlib.dirs.user-home}"; group = "users"; - user = "${inputs.zeroq.devices.admin}"; + user = "${config.xlib.devices.admin}"; }; pipewire = { enable = lib.mkDefault true; diff --git a/devices/server.nix b/devices/server.nix index eb4b532..e2ba4bd 100755 --- a/devices/server.nix +++ b/devices/server.nix @@ -43,7 +43,7 @@ let users = { users = { - "${inputs.zeroq.devices.admin}" = { + "${config.xlib.devices.admin}" = { openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P root@sapphira" ]; @@ -53,7 +53,7 @@ let fileSystems = { # External drive - "${inputs.zeroq.dirs.server-home}" = { + "${config.xlib.dirs.server-home}" = { device = "/dev/disk/by-uuid/37e53ebc-5343-a94d-9fe2-0ca39e13a8de"; fsType = "ext4"; options = [ @@ -74,7 +74,7 @@ let }; # beets "/mnt/beets/music" = { - device = "${inputs.zeroq.dirs.server-home}/Music"; + device = "${config.xlib.dirs.server-home}/Music"; options = [ "bind" "uid=1000" @@ -110,19 +110,19 @@ let "path" = "/etc/nixos"; "browseable" = "yes"; "read only" = "no"; - "valid users" = "${inputs.zeroq.devices.admin}"; + "valid users" = "${config.xlib.devices.admin}"; "guest ok" = "no"; "writable" = "yes"; "create mask" = 755; "directory mask" = 755; - "force user" = "${inputs.zeroq.devices.admin}"; + "force user" = "${config.xlib.devices.admin}"; "force group" = "users"; }; root = { "path" = "/"; "browseable" = "yes"; "read only" = "no"; - "valid users" = "${inputs.zeroq.devices.admin}"; + "valid users" = "${config.xlib.devices.admin}"; "guest ok" = "no"; "writable" = "yes"; #"create mask" = 0644; @@ -130,16 +130,16 @@ let "force user" = "root"; "force group" = "root"; }; - "${inputs.zeroq.devices.admin}" = { - "path" = "${inputs.zeroq.dirs.server-home}"; + "${config.xlib.devices.admin}" = { + "path" = "${config.xlib.dirs.server-home}"; "browseable" = "yes"; "read only" = "no"; - "valid users" = "${inputs.zeroq.devices.admin}"; + "valid users" = "${config.xlib.devices.admin}"; "guest ok" = "no"; "writable" = "yes"; "create mask" = 700; "directory mask" = 700; - "force user" = "${inputs.zeroq.devices.admin}"; + "force user" = "${config.xlib.devices.admin}"; "force group" = "users"; }; }; @@ -147,9 +147,9 @@ let calibre-web = { enable = true; group = "users"; - user = "${inputs.zeroq.devices.admin}"; + user = "${config.xlib.devices.admin}"; options = { - calibreLibrary = "${inputs.zeroq.dirs.calibre-library}"; + calibreLibrary = "${config.xlib.dirs.calibre-library}"; enableBookUploading = true; enableKepubify = false; }; @@ -174,14 +174,14 @@ let }; transmission = { enable = false; - credentialsFile = "${inputs.zeroq.dirs.server-home}/server/transmission/settings.json"; + credentialsFile = "${config.xlib.dirs.server-home}/server/transmission/settings.json"; openRPCPort = true; package = pkgs.transmission_4; - user = "${inputs.zeroq.devices.admin}"; + user = "${config.xlib.devices.admin}"; group = "users"; settings = { - download-dir = "${inputs.zeroq.dirs.server-home}/Downloads"; - incomplete-dir = "${inputs.zeroq.dirs.server-home}/Downloads/Temp"; + download-dir = "${config.xlib.dirs.server-home}/Downloads"; + incomplete-dir = "${config.xlib.dirs.server-home}/Downloads/Temp"; incomplete-dir-enabled = true; rpc-bind-address = "0.0.0.0"; rpc-port = 9091; @@ -193,16 +193,16 @@ let enable = true; systemService = true; guiAddress = "0.0.0.0:8384"; - configDir = "${inputs.zeroq.dirs.storage}/Syncthing/${inputs.zeroq.devices.server.hostname}"; - dataDir = "${inputs.zeroq.dirs.server-home}"; + configDir = "${config.xlib.dirs.storage}/Syncthing/${config.xlib.devices.server.hostname}"; + dataDir = "${config.xlib.dirs.server-home}"; group = "users"; - user = "${inputs.zeroq.devices.admin}"; + user = "${config.xlib.devices.admin}"; }; tailscale.enable = true; }; networking = { - hostName = "${inputs.zeroq.devices.server.hostname}"; + hostName = "${config.xlib.devices.server.hostname}"; networkmanager.enable = true; firewall.enable = false; }; diff --git a/devices/vds.nix b/devices/vds.nix index 82f5ae6..c1307c3 100755 --- a/devices/vds.nix +++ b/devices/vds.nix @@ -52,7 +52,7 @@ let "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P" ]; }; - "${inputs.zeroq.devices.admin}" = { + "${config.xlib.devices.admin}" = { openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKduJia+unaQQdN6X5syaHvnpIutO+yZwvfiCP4qKQ/P" ]; @@ -81,19 +81,19 @@ let "path" = "/etc/nixos"; "browseable" = "yes"; "read only" = "no"; - "valid users" = "${inputs.zeroq.devices.admin}"; + "valid users" = "${config.xlib.devices.admin}"; "guest ok" = "no"; "writable" = "yes"; "create mask" = 755; "directory mask" = 755; - "force user" = "${inputs.zeroq.devices.admin}"; + "force user" = "${config.xlib.devices.admin}"; "force group" = "users"; }; root = { "path" = "/"; "browseable" = "yes"; "read only" = "no"; - "valid users" = "${inputs.zeroq.devices.admin}"; + "valid users" = "${config.xlib.devices.admin}"; "guest ok" = "no"; "writable" = "yes"; #"create mask" = 0644; @@ -101,16 +101,16 @@ let "force user" = "root"; "force group" = "root"; }; - "${inputs.zeroq.devices.admin}" = { - "path" = "/home/${inputs.zeroq.devices.admin}"; + "${config.xlib.devices.admin}" = { + "path" = "/home/${config.xlib.devices.admin}"; "browseable" = "yes"; "read only" = "no"; - "valid users" = "${inputs.zeroq.devices.admin}"; + "valid users" = "${config.xlib.devices.admin}"; "guest ok" = "no"; "writable" = "yes"; "create mask" = 700; "directory mask" = 700; - "force user" = "${inputs.zeroq.devices.admin}"; + "force user" = "${config.xlib.devices.admin}"; "force group" = "users"; }; }; @@ -138,7 +138,7 @@ let }; networking = { - hostName = "${inputs.zeroq.devices.vds.hostname}"; + hostName = "${config.xlib.devices.vds.hostname}"; networkmanager.enable = true; firewall.enable = true; }; diff --git a/devices/wsl.nix b/devices/wsl.nix index 0d337af..9043c6a 100755 --- a/devices/wsl.nix +++ b/devices/wsl.nix @@ -37,7 +37,7 @@ let fileSystems = { # beets "/mnt/beets/music" = { - device = "${inputs.zeroq.dirs.wsl-home}/Music"; + device = "${config.xlib.dirs.wsl-home}/Music"; options = [ "bind" "uid=1000" @@ -62,7 +62,7 @@ let networking = { firewall.enable = false; - hostName = "${config.xlib.device.hostname}"; + hostName = config.xlib.device.hostname; }; wsl = { diff --git a/flake.nix b/flake.nix index c5b88ea..ba033a5 100755 --- a/flake.nix +++ b/flake.nix @@ -144,18 +144,18 @@ homeConfigurations = { default = import ./home/default.nix flakeContext; - root = import ./home/root.nix flakeContext; - main = import ./home/main.nix flakeContext; - server = import ./home/server.nix flakeContext; - wsl = import ./home/wsl.nix flakeContext; + # root = import ./home/root.nix flakeContext; + # main = import ./home/main.nix flakeContext; + # server = import ./home/server.nix flakeContext; + # wsl = import ./home/wsl.nix flakeContext; }; homeModules = { - minimal = import ./home/modules/minimal.nix flakeContext; - wsl = import ./home/modules/wsl.nix flakeContext; - packages = import ./home/modules/packages.nix flakeContext; - default = import ./home/modules/default.nix flakeContext; - dconf = import ./home/modules/dconf.nix flakeContext; - plasma-manager = import ./home/modules/plasma-manager.nix flakeContext; + # minimal = import ./home/modules/minimal.nix flakeContext; + # wsl = import ./home/modules/wsl.nix flakeContext; + # packages = import ./home/modules/packages.nix flakeContext; + # default = import ./home/modules/default.nix flakeContext; + # dconf = import ./home/modules/dconf.nix flakeContext; + # plasma-manager = import ./home/modules/plasma-manager.nix flakeContext; }; }; } diff --git a/home/default.nix b/home/default.nix index 5edaa13..3177507 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,7 +10,8 @@ let }: { 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 = { username = xlib.device.username; @@ -29,7 +30,8 @@ let }: { imports = [ - inputs.self.homeModules."${xlib.device.type}" + (./type + "/${xlib.device.type}.nix") + #inputs.self.homeModules."${xlib.device.type}" ]; home = { username = "root"; diff --git a/home/main.nix b/home/main.nix index 0d83fda..6f41b42 100755 --- a/home/main.nix +++ b/home/main.nix @@ -14,33 +14,33 @@ let autostart.enable = true; configFile = { "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"; }; "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"; }; "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"; }; "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"; }; "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"; }; }; dataFile = { "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"; }; "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"; }; }; @@ -59,18 +59,18 @@ let }; home = { - username = "${inputs.zeroq.devices.admin}"; + username = "${config.xlib.devices.admin}"; file = { "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"; }; "External" = { - source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.therima-drive}"; + source = config.lib.file.mkOutOfStoreSymlink "${config.xlib.dirs.therima-drive}"; target = "External"; }; "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"; }; }; @@ -90,7 +90,7 @@ let home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.${inputs.zeroq.devices.admin} = homeModule; + users.${config.xlib.devices.admin} = homeModule; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; extraSpecialArgs = { inherit (config.networking) hostName; diff --git a/home/modules/server.nix b/home/modules/server.nix index ccb9d89..bd205a0 100644 --- a/home/modules/server.nix +++ b/home/modules/server.nix @@ -7,8 +7,8 @@ }: let # Paths - beetsPath = "${inputs.zeroq.dirs.storage}/beets/linux"; - sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; + beetsPath = "${config.xlib.dirs.storage}/beets/linux"; + sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}"; musicPath = "${config.home.homeDirectory}/External/Music"; in { diff --git a/home/modules/wsl.nix b/home/modules/wsl.nix index 911d443..3c8f51a 100644 --- a/home/modules/wsl.nix +++ b/home/modules/wsl.nix @@ -6,10 +6,10 @@ }: let # Paths - beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux"; - #sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; + beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux"; + #sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}"; musicPath = "${config.home.homeDirectory}/External/Music"; - externalPath = "${inputs.zeroq.dirs.wsl-home}"; + externalPath = "${config.xlib.dirs.wsl-home}"; in { imports = [ @@ -38,7 +38,7 @@ in # }; }; home = { - #username = "${inputs.zeroq.devices.admin}"; + #username = "${config.xlib.devices.admin}"; file = { "External" = { source = config.lib.file.mkOutOfStoreSymlink externalPath; diff --git a/home/server.nix b/home/server.nix index 3242f4d..51b97d5 100755 --- a/home/server.nix +++ b/home/server.nix @@ -9,8 +9,8 @@ let }: let # Paths - beetsPath = "${inputs.zeroq.dirs.storage}/beets/linux"; - sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; + beetsPath = "${config.xlib.dirs.storage}/beets/linux"; + sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}"; musicPath = "${config.home.homeDirectory}/External/Music"; in { @@ -50,7 +50,7 @@ let target = "${config.home.homeDirectory}/Music"; }; }; - username = "${inputs.zeroq.devices.admin}"; + username = "${config.xlib.devices.admin}"; }; }; @@ -60,7 +60,7 @@ let home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.${inputs.zeroq.devices.admin} = homeModule; + users.${config.xlib.devices.admin} = homeModule; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; }; }; diff --git a/home/modules/minimal.nix b/home/type/minimal.nix similarity index 100% rename from home/modules/minimal.nix rename to home/type/minimal.nix diff --git a/home/type/wsl.nix b/home/type/wsl.nix index 4f69653..0f79aeb 100644 --- a/home/type/wsl.nix +++ b/home/type/wsl.nix @@ -1,4 +1,3 @@ -#{ inputs, ... }@flakeContext: { config, pkgs, @@ -6,14 +5,14 @@ }: let # Paths - beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux"; - #sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; + beetsPath = "${xlib.dirs.wsl-storage}/beets/linux"; + #sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}"; musicPath = "${config.home.homeDirectory}/External/Music"; - externalPath = "${inputs.zeroq.dirs.wsl-home}"; + externalPath = "${xlib.dirs.wsl-home}"; in { imports = [ - inputs.self.homeModules.minimal + ./minimal.nix ]; xdg = { enable = true; @@ -38,7 +37,6 @@ in # }; }; home = { - #username = "${inputs.zeroq.devices.admin}"; file = { "External" = { source = config.lib.file.mkOutOfStoreSymlink externalPath; diff --git a/home/wsl.nix b/home/wsl.nix index 337df97..87f0655 100755 --- a/home/wsl.nix +++ b/home/wsl.nix @@ -9,10 +9,10 @@ let }: let # Paths - beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux"; - #sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}"; + beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux"; + #sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}"; musicPath = "${config.home.homeDirectory}/External/Music"; - externalPath = "${inputs.zeroq.dirs.wsl-home}"; + externalPath = "${config.xlib.dirs.wsl-home}"; in { imports = [ @@ -42,7 +42,7 @@ let }; home = { - #username = "${inputs.zeroq.devices.admin}"; + #username = "${config.xlib.devices.admin}"; file = { "External" = { source = config.lib.file.mkOutOfStoreSymlink externalPath; @@ -69,7 +69,7 @@ let home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.${inputs.zeroq.devices.admin} = homeModule; + users.${config.xlib.devices.admin} = homeModule; # sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; # extraSpecialArgs = { # inherit (config.networking) hostName; diff --git a/modules/default.nix b/modules/default.nix index 9472ad8..e847236 100755 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,7 +7,8 @@ imports = with inputs; [ ./essentials ./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 nix-index-database.nixosModules.nix-index # nix-index module diff --git a/modules/server/cloudflared.nix b/modules/server/cloudflared.nix index 187764a..ad6f5de 100755 --- a/modules/server/cloudflared.nix +++ b/modules/server/cloudflared.nix @@ -9,10 +9,10 @@ services = { cloudflared = { enable = false; - certificateFile = "${inputs.zeroq.dirs.server-credentials}/cloudflared/cert.pem"; + certificateFile = "${config.xlib.dirs.server-credentials}/cloudflared/cert.pem"; tunnels = { "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; ingress = { "immich.zeroq.ru" = { @@ -25,7 +25,7 @@ default = "http_status:404"; }; # "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; # ingress = { # "nextcloud.zeroq.ru" = { @@ -57,7 +57,7 @@ # ]; # wantedBy = [ "multi-user.target" ]; # 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"; # User = "root"; # Restart = "on-failure"; diff --git a/modules/server/immich.nix b/modules/server/immich.nix index 2c827dd..7e720bc 100755 --- a/modules/server/immich.nix +++ b/modules/server/immich.nix @@ -20,7 +20,7 @@ }; fileSystems."${config.services.immich.mediaLocation}" = { - device = "${inputs.zeroq.dirs.immich-folder}"; + device = "${config.xlib.dirs.immich-folder}"; options = [ "bind" #"uid=1000" diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 1512184..67384c3 100755 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -76,7 +76,7 @@ }; fileSystems."/mnt/nextcloud" = { - device = "${inputs.zeroq.dirs.nextcloud-folder}"; + device = "${config.xlib.dirs.nextcloud-folder}"; options = [ "bind" #"uid=1000" diff --git a/modules/software/ai.nix b/modules/software/ai.nix index eafdbf7..dc85aa1 100755 --- a/modules/software/ai.nix +++ b/modules/software/ai.nix @@ -15,7 +15,7 @@ # HSA_OVERRIDE_GFX_VERSION = "11.5.0"; # 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"; # acceleration = "rocm"; # rocmOverrideGfx = "11.5.0"; diff --git a/modules/software/beets/default.nix b/modules/software/beets/default.nix index 661dd9b..3109eea 100755 --- a/modules/software/beets/default.nix +++ b/modules/software/beets/default.nix @@ -20,12 +20,12 @@ let in { 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 = { - "${inputs.zeroq.devices.admin}" = { + "${config.xlib.devices.admin}" = { packages = [ beetsEnv pkgs.mp3gain