diff --git a/configurations/mini-pc.nix b/configurations/mini-pc.nix index bd440d8..51966e9 100644 --- a/configurations/mini-pc.nix +++ b/configurations/mini-pc.nix @@ -26,6 +26,7 @@ let fileSystems = { "${xlib.dirs.therima-drive}" = { + enable = false; device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; fsType = "ntfs3"; options = [ @@ -38,6 +39,7 @@ let ]; }; "${xlib.dirs.vetymae-drive}" = { + enable = false; device = "/dev/disk/by-uuid/6408433908430A0E"; fsType = "ntfs3"; options = [ @@ -50,6 +52,7 @@ let ]; }; "${xlib.dirs.soptur-drive}" = { + enable = false; device = "/dev/disk/by-uuid/C00C56E40C56D54E"; fsType = "ntfs3"; options = [ diff --git a/home/home.nix b/home/home.nix index dbd51ff..bdb6d71 100644 --- a/home/home.nix +++ b/home/home.nix @@ -51,9 +51,15 @@ let root = mkRootModule "root"; "${xlib.device.username}" = mkHomeModule xlib.device.username; } - // lib.optionalAttrs (xlib.device.type == "secondary") { - snity = mkOthersModule "snity"; - }; + // + lib.optionalAttrs + (builtins.elem xlib.device.type [ + "secondary" + "primary" + ]) + { + snity = mkOthersModule "snity"; + }; sharedModules = [ inputs.plasma-manager.homeModules.plasma-manager ]; diff --git a/home/others/primary.nix b/home/others/primary.nix new file mode 100644 index 0000000..0cc3792 --- /dev/null +++ b/home/others/primary.nix @@ -0,0 +1,52 @@ +{ + config, + lib, + pkgs, + xlib, + ... +}: +let + symlinksPaths = { + "/home/oqyude/Games/PrismLaunchers" = "${config.home.homeDirectory}/Games/PrismLaunchers"; + "${config.home.homeDirectory}/Games/PrismLaunchers/${config.home.username}" = + ".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/home/others/secondary.nix b/home/others/secondary.nix index e83acd0..0cc3792 100644 --- a/home/others/secondary.nix +++ b/home/others/secondary.nix @@ -7,7 +7,9 @@ }: let symlinksPaths = { - "${xlib.dirs.lamet-drive}/Games/PrismLauncher - Snity" = ".local/share/PrismLauncher"; + "/home/oqyude/Games/PrismLaunchers" = "${config.home.homeDirectory}/Games/PrismLaunchers"; + "${config.home.homeDirectory}/Games/PrismLaunchers/${config.home.username}" = + ".local/share/PrismLauncher"; }; mkLinks = lib.mapAttrs' (sourcePath: targetPath: { name = targetPath; diff --git a/home/primary.nix b/home/primary.nix index 53a220d..a454928 100644 --- a/home/primary.nix +++ b/home/primary.nix @@ -8,6 +8,7 @@ let symlinksPaths = { # cfg + "${xlib.dirs.user-storage}/ssh/config" = ".ssh/config"; "${xlib.dirs.user-storage}/beets" = ".config/beets"; "${xlib.dirs.user-storage}/ludusavi" = ".config/ludusavi"; "${xlib.dirs.user-storage}/solaar" = ".config/solaar"; @@ -16,11 +17,9 @@ let "${xlib.dirs.user-storage}/v2rayN" = ".local/share/v2rayN"; "/etc/nixos" = "Configuration"; - "${config.home.homeDirectory}/Games/PrismLauncher" = ".local/share/PrismLauncher"; - "${xlib.dirs.vetymae-drive}/Users/oqyude/Storage" = "Storage"; + "${config.home.homeDirectory}/Games/PrismLaunchers/${config.home.username}" = + ".local/share/PrismLauncher"; "${xlib.dirs.vetymae-drive}/Users/oqyude/Music" = "Music"; - "${xlib.dirs.vetymae-drive}/Users/oqyude/Misc" = "Misc"; - "${xlib.dirs.vetymae-drive}/Users/oqyude/Vaults" = "Vaults"; # smthng # "${xlib.dirs.soptur-drive}/AI/LM Studio" = ".lmstudio"; diff --git a/home/secondary.nix b/home/secondary.nix index 62fff81..08a6161 100644 --- a/home/secondary.nix +++ b/home/secondary.nix @@ -8,6 +8,7 @@ let symlinksPaths = { # cfg + "${xlib.dirs.user-storage}/ssh/config" = ".ssh/config"; "${xlib.dirs.user-storage}/beets" = ".config/beets"; "${xlib.dirs.user-storage}/ludusavi" = ".config/ludusavi"; "${xlib.dirs.user-storage}/solaar" = ".config/solaar"; @@ -16,12 +17,13 @@ let "${xlib.dirs.user-storage}/v2rayN" = ".local/share/v2rayN"; "/etc/nixos" = "Configuration"; - "${xlib.dirs.lamet-drive}/Games/PrismLauncher" = ".local/share/PrismLauncher"; - "${xlib.dirs.lamet-drive}/Users/oqyude/Storage" = "Storage"; + "${config.home.homeDirectory}/Games/PrismLaunchers/${config.home.username}" = + ".local/share/PrismLauncher"; + # "${xlib.dirs.lamet-drive}/Users/oqyude/Storage" = "Storage"; "${xlib.dirs.lamet-drive}/Users/oqyude/Music" = "Music"; - "${xlib.dirs.lamet-drive}/Users/oqyude/Misc" = "Misc"; - "${xlib.dirs.lamet-drive}/Users/oqyude/Vaults" = "Vaults"; - "${xlib.dirs.lamet-drive}/Users/oqyude/Credentials" = "Credentials"; + # "${xlib.dirs.lamet-drive}/Users/oqyude/Misc" = "Misc"; + # "${xlib.dirs.lamet-drive}/Users/oqyude/Vaults" = "Vaults"; + # "${xlib.dirs.lamet-drive}/Users/oqyude/Credentials" = "Credentials"; }; mkLinks = lib.mapAttrs' (sourcePath: targetPath: { name = targetPath; diff --git a/modules/users.nix b/modules/users.nix index 0faa486..207f1c3 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -39,6 +39,10 @@ }; }; + systemd.tmpfiles.rules = [ + "z /mnt/shared 2775 root users -" + ]; + sops = { age = { sshKeyPaths = [