From 20ad33b742e7cc9a012fd41a7bdf41af73e49132 Mon Sep 17 00:00:00 2001 From: oqyude Date: Mon, 4 Aug 2025 16:01:18 +0300 Subject: [PATCH] one win --- devices/laptop.nix | 2 +- devices/mini-pc.nix | 2 +- devices/wsl.nix | 24 ++++++++++++---- flake.nix | 2 ++ home/default.nix | 12 +++++--- home/modules/minimal.nix | 4 +-- home/modules/wsl.nix | 59 ++++++++++++++++++++++++++++++++++++++++ home/wsl.nix | 2 +- 8 files changed, 93 insertions(+), 14 deletions(-) create mode 100644 home/modules/wsl.nix diff --git a/devices/laptop.nix b/devices/laptop.nix index c30ad15..f58cfc9 100755 --- a/devices/laptop.nix +++ b/devices/laptop.nix @@ -26,6 +26,7 @@ let self.nixosModules.desktop self.homeConfigurations.main.nixosModule self.homeConfigurations.root.nixosModule + sops-nix.nixosModules.sops ] ++ builtins.attrValues inputs.self.nixosModules.extra.self; @@ -182,7 +183,6 @@ in inputs.nixpkgs.lib.nixosSystem { modules = [ nixosModule - inputs.sops-nix.nixosModules.sops ]; system = "x86_64-linux"; } diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix index 568c8de..a816b2e 100755 --- a/devices/mini-pc.nix +++ b/devices/mini-pc.nix @@ -18,6 +18,7 @@ let ./hardware/logitech.nix self.nixosModules.default + sops-nix.nixosModules.sops self.nixosModules.server.open-webui self.nixosModules.software.wine self.nixosModules.software.beets @@ -166,7 +167,6 @@ in inputs.nixpkgs.lib.nixosSystem { modules = [ nixosModule - inputs.sops-nix.nixosModules.sops ]; system = "x86_64-linux"; } diff --git a/devices/wsl.nix b/devices/wsl.nix index d9f045a..4db4c41 100755 --- a/devices/wsl.nix +++ b/devices/wsl.nix @@ -17,13 +17,27 @@ let self.nixosModules.software.beets self.nixosModules.server.open-webui - #self.homeConfigurations.default.nixosModule - (inputs.self.homeConfigurations.default { - inherit inputs; - device.type = deviceType; - }).nixosModule + self.homeConfigurations.default.nixosModule + # (self.homeConfigurations.default.nixosModule { + # inherit inputs; + # config.device.type = deviceType; + # }) + # ( { + # extraSpecialArgs = { + # inherit inputs; + # inherit (config.device) type; + # #deviceType = config.device.type; + # }; + # }) ]; + home-manager = { + extraSpecialArgs = { + inherit inputs; + deviceType = config.device.type; # Переименовываем type в deviceType + }; + }; + fileSystems = { # beets "/mnt/beets/music" = { diff --git a/flake.nix b/flake.nix index 692ae50..c5b88ea 100755 --- a/flake.nix +++ b/flake.nix @@ -150,6 +150,8 @@ 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; diff --git a/home/default.nix b/home/default.nix index 2264500..c709a3c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,11 +1,11 @@ { inputs, ... }@flakeContext: let homeModule = - { + { config, lib, pkgs, - deviceType + deviceType, ... }: { @@ -13,7 +13,7 @@ let inputs.self.homeModules.${deviceType} ]; home = { - username = inputs.zeroq.devices.admin; + username = "${inputs.zeroq.devices.admin}"; stateVersion = lib.mkDefault "25.05"; homeDirectory = lib.mkDefault "/home/${config.home.username}"; enableNixpkgsReleaseCheck = false; @@ -24,7 +24,7 @@ let config, lib, pkgs, - deviceType + deviceType, ... }: { @@ -47,6 +47,10 @@ let users.${inputs.zeroq.devices.admin} = homeModule; users.root = rootModule; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; + # extraSpecialArgs = { + # inherit inputs; + # inherit (config.device.type) deviceType; + # }; }; }; in diff --git a/home/modules/minimal.nix b/home/modules/minimal.nix index 479a290..a77ea4b 100644 --- a/home/modules/minimal.nix +++ b/home/modules/minimal.nix @@ -4,8 +4,8 @@ pkgs, ... }: -{ - programs = { +{ + programs = { btop.enable = true; broot.enable = true; bottom.enable = true; diff --git a/home/modules/wsl.nix b/home/modules/wsl.nix new file mode 100644 index 0000000..3c038f7 --- /dev/null +++ b/home/modules/wsl.nix @@ -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; + # }; + }; +} diff --git a/home/wsl.nix b/home/wsl.nix index 7bd09a1..337df97 100755 --- a/home/wsl.nix +++ b/home/wsl.nix @@ -42,7 +42,7 @@ let }; home = { - username = "${inputs.zeroq.devices.admin}"; + #username = "${inputs.zeroq.devices.admin}"; file = { "External" = { source = config.lib.file.mkOutOfStoreSymlink externalPath;