From 52b6290e1cfa0e8a7f7aa57f73d705796f71aa1f Mon Sep 17 00:00:00 2001 From: oqyude Date: Mon, 4 Aug 2025 15:35:09 +0300 Subject: [PATCH] too manya bugs --- devices/wsl.nix | 6 +++- flake.nix | 1 + home/default.nix | 64 +++++++++++++++++++++++++++++++++ home/modules/minimal.nix | 14 ++++++++ home/modules/packages.nix | 6 +--- modules/essentials/packages.nix | 9 +---- 6 files changed, 86 insertions(+), 14 deletions(-) create mode 100644 home/default.nix create mode 100644 home/modules/minimal.nix diff --git a/devices/wsl.nix b/devices/wsl.nix index fa2aada..d9f045a 100755 --- a/devices/wsl.nix +++ b/devices/wsl.nix @@ -17,7 +17,11 @@ let self.nixosModules.software.beets self.nixosModules.server.open-webui - self.homeConfigurations.wsl.nixosModule + #self.homeConfigurations.default.nixosModule + (inputs.self.homeConfigurations.default { + inherit inputs; + device.type = deviceType; + }).nixosModule ]; fileSystems = { diff --git a/flake.nix b/flake.nix index e73198f..692ae50 100755 --- a/flake.nix +++ b/flake.nix @@ -143,6 +143,7 @@ }; 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; diff --git a/home/default.nix b/home/default.nix new file mode 100644 index 0000000..2264500 --- /dev/null +++ b/home/default.nix @@ -0,0 +1,64 @@ +{ inputs, ... }@flakeContext: +let + homeModule = + { + config, + lib, + pkgs, + deviceType + ... + }: + { + imports = [ + inputs.self.homeModules.${deviceType} + ]; + home = { + username = inputs.zeroq.devices.admin; + stateVersion = lib.mkDefault "25.05"; + homeDirectory = lib.mkDefault "/home/${config.home.username}"; + enableNixpkgsReleaseCheck = false; + }; + }; + rootModule = + { + config, + lib, + pkgs, + deviceType + ... + }: + { + imports = [ + inputs.self.homeModules.${deviceType} + ]; + home = { + username = "root"; + stateVersion = lib.mkDefault "25.05"; + homeDirectory = lib.mkDefault "/${config.home.username}"; + enableNixpkgsReleaseCheck = false; + }; + }; + nixosModule = + { ... }: + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.${inputs.zeroq.devices.admin} = homeModule; + users.root = rootModule; + sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; + }; + }; +in +( + (inputs.home-manager.lib.homeManagerConfiguration { + modules = [ + homeModule + rootModule + ]; + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + }) + // { + inherit nixosModule; + } +) diff --git a/home/modules/minimal.nix b/home/modules/minimal.nix new file mode 100644 index 0000000..479a290 --- /dev/null +++ b/home/modules/minimal.nix @@ -0,0 +1,14 @@ +{ inputs, ... }@flakeContext: +{ + config, + pkgs, + ... +}: +{ + programs = { + btop.enable = true; + broot.enable = true; + bottom.enable = true; + fastfetch.enable = true; + }; +} diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0ddc281..fe89c4e 100755 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -9,7 +9,6 @@ let in { programs = { - btop.enable = true; mangohud.enable = true; keepassxc.enable = true; zed-editor = { @@ -65,7 +64,7 @@ in vlc normcap zerotierone - nextcloud-client + #nextcloud-client # (handbrake.overrideAttrs (old: { # configureFlags = old.configureFlags ++ [ "--enable-vce" ]; @@ -75,9 +74,6 @@ in # ]; # })) - #tg - #reaper - # Games ludusavi prismlauncher diff --git a/modules/essentials/packages.nix b/modules/essentials/packages.nix index 75df934..e153efd 100755 --- a/modules/essentials/packages.nix +++ b/modules/essentials/packages.nix @@ -23,12 +23,8 @@ # Lazy lazycli - lazydocker - lazyjournal lazysql - - gitui - broot + lazyjournal # Base curl @@ -46,10 +42,7 @@ tree # Monitoring - bottom smartmontools - btop - fastfetch # Disk parted