This commit is contained in:
2025-08-04 16:01:18 +03:00
parent 52b6290e1c
commit 20ad33b742
8 changed files with 93 additions and 14 deletions
+1 -1
View File
@@ -26,6 +26,7 @@ let
self.nixosModules.desktop self.nixosModules.desktop
self.homeConfigurations.main.nixosModule self.homeConfigurations.main.nixosModule
self.homeConfigurations.root.nixosModule self.homeConfigurations.root.nixosModule
sops-nix.nixosModules.sops
] ]
++ builtins.attrValues inputs.self.nixosModules.extra.self; ++ builtins.attrValues inputs.self.nixosModules.extra.self;
@@ -182,7 +183,6 @@ in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
nixosModule nixosModule
inputs.sops-nix.nixosModules.sops
]; ];
system = "x86_64-linux"; system = "x86_64-linux";
} }
+1 -1
View File
@@ -18,6 +18,7 @@ let
./hardware/logitech.nix ./hardware/logitech.nix
self.nixosModules.default self.nixosModules.default
sops-nix.nixosModules.sops
self.nixosModules.server.open-webui self.nixosModules.server.open-webui
self.nixosModules.software.wine self.nixosModules.software.wine
self.nixosModules.software.beets self.nixosModules.software.beets
@@ -166,7 +167,6 @@ in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
nixosModule nixosModule
inputs.sops-nix.nixosModules.sops
]; ];
system = "x86_64-linux"; system = "x86_64-linux";
} }
+19 -5
View File
@@ -17,13 +17,27 @@ let
self.nixosModules.software.beets self.nixosModules.software.beets
self.nixosModules.server.open-webui self.nixosModules.server.open-webui
#self.homeConfigurations.default.nixosModule self.homeConfigurations.default.nixosModule
(inputs.self.homeConfigurations.default { # (self.homeConfigurations.default.nixosModule {
inherit inputs; # inherit inputs;
device.type = deviceType; # config.device.type = deviceType;
}).nixosModule # })
# ( {
# extraSpecialArgs = {
# inherit inputs;
# inherit (config.device) type;
# #deviceType = config.device.type;
# };
# })
]; ];
home-manager = {
extraSpecialArgs = {
inherit inputs;
deviceType = config.device.type; # Переименовываем type в deviceType
};
};
fileSystems = { fileSystems = {
# beets # beets
"/mnt/beets/music" = { "/mnt/beets/music" = {
+2
View File
@@ -150,6 +150,8 @@
wsl = import ./home/wsl.nix flakeContext; wsl = import ./home/wsl.nix flakeContext;
}; };
homeModules = { homeModules = {
minimal = import ./home/modules/minimal.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;
+7 -3
View File
@@ -5,7 +5,7 @@ let
config, config,
lib, lib,
pkgs, pkgs,
deviceType deviceType,
... ...
}: }:
{ {
@@ -13,7 +13,7 @@ let
inputs.self.homeModules.${deviceType} inputs.self.homeModules.${deviceType}
]; ];
home = { home = {
username = inputs.zeroq.devices.admin; username = "${inputs.zeroq.devices.admin}";
stateVersion = lib.mkDefault "25.05"; stateVersion = lib.mkDefault "25.05";
homeDirectory = lib.mkDefault "/home/${config.home.username}"; homeDirectory = lib.mkDefault "/home/${config.home.username}";
enableNixpkgsReleaseCheck = false; enableNixpkgsReleaseCheck = false;
@@ -24,7 +24,7 @@ let
config, config,
lib, lib,
pkgs, pkgs,
deviceType deviceType,
... ...
}: }:
{ {
@@ -47,6 +47,10 @@ let
users.${inputs.zeroq.devices.admin} = homeModule; users.${inputs.zeroq.devices.admin} = homeModule;
users.root = rootModule; users.root = rootModule;
sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
# extraSpecialArgs = {
# inherit inputs;
# inherit (config.device.type) deviceType;
# };
}; };
}; };
in in
+59
View File
@@ -0,0 +1,59 @@
{ inputs, ... }@flakeContext:
{
config,
pkgs,
...
}:
let
# Paths
beetsPath = "${inputs.zeroq.dirs.wsl-storage}/beets/linux";
#sshPath = "${inputs.zeroq.dirs.storage}/ssh/${inputs.zeroq.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${inputs.zeroq.dirs.wsl-home}";
in
{
xdg = {
enable = true;
autostart.enable = true;
configFile = {
"beets" = {
source = config.lib.file.mkOutOfStoreSymlink beetsPath;
target = "beets";
};
};
# userDirs = {
# enable = false;
# createDirectories = false;
# desktop = null;
# documents = null;
# download = null;
# music = null;
# pictures = null;
# publicShare = null;
# templates = null;
# videos = null;
# };
};
home = {
#username = "${inputs.zeroq.devices.admin}";
file = {
"External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath;
target = "External";
};
"Music" = {
source = config.lib.file.mkOutOfStoreSymlink musicPath;
target = "${config.home.homeDirectory}/Music";
};
};
# pointerCursor = {
# enable = true;
# x11.enable = true;
# gtk.enable = true;
# size = 24;
# name = "Qogir";
# package = pkgs.qogir-icon-theme;
# };
};
}
+1 -1
View File
@@ -42,7 +42,7 @@ let
}; };
home = { home = {
username = "${inputs.zeroq.devices.admin}"; #username = "${inputs.zeroq.devices.admin}";
file = { file = {
"External" = { "External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath; source = config.lib.file.mkOutOfStoreSymlink externalPath;