From 185cf18c0a761ef9407f68838e0abb96847d75ae Mon Sep 17 00:00:00 2001 From: oqyude Date: Sun, 18 Jan 2026 17:42:21 +0300 Subject: [PATCH] 123 --- home/home.nix | 23 ++++++++++++++++-- home/others/secondary.nix | 50 +++++++++++++++++++++++++++++++++++++++ modules/users.nix | 6 ++--- 3 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 home/others/secondary.nix diff --git a/home/home.nix b/home/home.nix index f099edc..1600908 100644 --- a/home/home.nix +++ b/home/home.nix @@ -20,15 +20,34 @@ let enableNixpkgsReleaseCheck = false; }; }; + mkRootModule = username: { + home = { + username = username; + stateVersion = lib.mkDefault "25.05"; + homeDirectory = if username == "root" then lib.mkDefault "/${username}" else lib.mkDefault "/home/${username}"; + enableNixpkgsReleaseCheck = false; + }; + }; + mkOthersModule = username: { + imports = [ + (./. + "/others/${xlib.device.type}.nix") + ]; + home = { + username = username; + stateVersion = lib.mkDefault "25.05"; + homeDirectory = if username == "root" then lib.mkDefault "/${username}" else lib.mkDefault "/home/${username}"; + enableNixpkgsReleaseCheck = false; + }; + }; in { home-manager = { useGlobalPkgs = true; useUserPackages = true; users = { - root = mkHomeModule "root"; + root = mkRootModule "root"; "${xlib.device.username}" = mkHomeModule xlib.device.username; - # "${xlib.users.new}" = mkHomeModule xlib.users.new; + "snity" = mkOthersModule "snity"; }; sharedModules = [ inputs.plasma-manager.homeModules.plasma-manager diff --git a/home/others/secondary.nix b/home/others/secondary.nix new file mode 100644 index 0000000..e83acd0 --- /dev/null +++ b/home/others/secondary.nix @@ -0,0 +1,50 @@ +{ + config, + lib, + pkgs, + xlib, + ... +}: +let + symlinksPaths = { + "${xlib.dirs.lamet-drive}/Games/PrismLauncher - Snity" = ".local/share/PrismLauncher"; + }; + mkLinks = lib.mapAttrs' (sourcePath: targetPath: { + name = targetPath; + value.source = config.lib.file.mkOutOfStoreSymlink "${sourcePath}"; + }) symlinksPaths; +in +{ + imports = [ + ../minimal.nix + ../modules/packages.nix + ../modules/plasma-manager.nix + ]; + xdg = { + enable = true; + autostart.enable = true; + userDirs = { + enable = true; + createDirectories = true; + desktop = "${config.xdg.dataHome}/desktop"; + documents = null; + download = "${config.home.homeDirectory}/Downloads"; + music = "${config.home.homeDirectory}/Music"; + pictures = "${config.home.homeDirectory}/Pictures"; + publicShare = "${config.home.homeDirectory}/Misc/Public"; + templates = null; + videos = "${config.home.homeDirectory}/Pictures/Videos"; + }; + }; + home = { + file = mkLinks; + pointerCursor = { + enable = true; + x11.enable = true; + gtk.enable = true; + size = 24; + name = "Qogir"; + package = pkgs.qogir-icon-theme; + }; + }; +} diff --git a/modules/users.nix b/modules/users.nix index d1e47f2..0faa486 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -6,9 +6,9 @@ ... }: { - # imports = [ - # ./others - # ]; + imports = [ + ./others + ]; xlib.device.username = "oqyude";