From bdf5f8096237a771586b8ce539a8b593aea4321e Mon Sep 17 00:00:00 2001 From: Tomas Rivera Date: Sun, 24 May 2026 12:16:27 +0200 Subject: [PATCH] dendritic: cleanup a bit --- flake.lock | 32 ++++++------ flake.nix | 3 +- modules/applications/zsh.nix | 3 +- modules/hosts/laptop.nix | 96 +++++++++++++++++------------------- modules/hosts/test.nix | 8 --- 5 files changed, 64 insertions(+), 78 deletions(-) delete mode 100644 modules/hosts/test.nix diff --git a/flake.lock b/flake.lock index e6e382d..2c609ee 100755 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1778644647, - "narHash": "sha256-iQIu4b5by8B3qKeigungSIgRoJg9HS1NiIZwqIbCGYk=", + "lastModified": 1779508871, + "narHash": "sha256-SFl2je8b423f/tIy0RTgCrWQUJiyFsAZp1Y0cccXqio=", "owner": "caelestia-dots", "repo": "cli", - "rev": "2ce6213698d1cfa15b4b067d35c3cda634f443dd", + "rev": "7f300626704b7a86fe838ab58df654fa99779613", "type": "github" }, "original": { @@ -33,11 +33,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1778986249, - "narHash": "sha256-6vIBRLIy41LDrm/ahTcrEj6pBB+oji7bP/5RY9Or0GA=", + "lastModified": 1779591587, + "narHash": "sha256-Ud83/zsmDSHcqQ64MRiQ7SnGkUVIpRzqwqBBU65DGXY=", "owner": "caelestia-dots", "repo": "shell", - "rev": "cf18cea3dad28ddda2f151b1b42a66f2fba1f84a", + "rev": "2f7ab5e4140d9188185f6c3164e428c1eeda1fe6", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1779506708, + "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1779414690, - "narHash": "sha256-gOTcX/9MZVMUE0Xvb4IEcv+0TQJkZFNEnL757ljU360=", + "lastModified": 1779536132, + "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6dedf69f94d03cbe7bdde106f2d4c23ae2a853bf", + "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1778488696, - "narHash": "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0=", + "lastModified": 1779430452, + "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=", "ref": "refs/heads/master", - "rev": "7d1c9a9c6721606b129829134d6f614f015621e2", - "revCount": 818, + "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00", + "revCount": 819, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, diff --git a/flake.nix b/flake.nix index 6f50187..be60ee3 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,6 @@ import-tree.url = "github:vic/import-tree"; # imports ./modules recursively }; outputs = inputs @ { flake-parts, ... }: - #outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); flake-parts.lib.mkFlake { inherit inputs; } ({ flake = let @@ -37,7 +36,7 @@ mkUnfreePredicate = pkg: builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreePkgs; mkPkgs = nixpkgsInput: - import nixpkgsInput { + import nixpkgsInput { inherit system; config.allowUnfreePredicate = mkUnfreePredicate; }; diff --git a/modules/applications/zsh.nix b/modules/applications/zsh.nix index 5a0b30f..d549653 100644 --- a/modules/applications/zsh.nix +++ b/modules/applications/zsh.nix @@ -7,9 +7,10 @@ }; }; }; - flake.homeModules.zsh = {pkgs, ...}: { + flake.homeModules.zsh = {pkgs, pkgs-unstable,...}: { home.packages = [ self.packages.${pkgs.system}.dejaManuallyDerived + #pkgs-unstable.deja ]; programs.zsh = { diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index 35e2acd..919651b 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -1,19 +1,16 @@ { inputs, self, ...}: { flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + #system = "x86_64-linux"; specialArgs = { - inherit (self) pkgs pkgs-unstable; + inherit (self) pkgs-unstable; }; modules = with self.nixosModules; [ -#inputs.home-manager.nixosModules.home-manager -#inputs.home-manager.nixosModules.default -# keep this alphabetically organised - -home-manager-laptop + # important do not remove + home-manager-laptop laptop { nixpkgs.pkgs = self.pkgs; } - +# keep this alphabetically organised anki audioAndMedia autoCleanup-laptop @@ -45,50 +42,9 @@ home-manager-laptop printer udev user - ];}; - flake.nixosModules.laptop = { ... }: { - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.11"; # Did you read the comment? - - /*#home-manager.users.tomasr = self.home.Configurations.tomasr; - #home-manager.nixosModule.home-manager.users.tomasr = self.homeConfigurations.tomasr; - home-manager.users.tomasr = { - imports = [ - self.homeModules.tomasr - ]; -};*/ - }; - flake.nixosModules.home-manager-laptop = { pkgs, ... }: { - imports = [ - inputs.home-manager.nixosModules.default # import official home-manager NixOS module ]; - - # Warning. Git is used in case I break everything up. It already saved me once - environment.systemPackages = [ pkgs.git ]; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - - extraSpecialArgs = { - #inherit (self) pkgs-unstable; - pkgs-unstable = self.pkgs-unstable; - inherit self; - }; - }; - - users.users.tomasr = { - isNormalUser = true; - #shell = pkgs.zsh; - }; - home-manager.users.tomasr = self.homeModules.tomasrModule; }; - # we shouldn't use homeConfigurations as it makes a standalone home-manager config - flake.homeModules.tomasrModule = { ... }: { + flake.homeModules.laptop = { ... }: { imports = with self.homeModules; [ inputs.caelestia-shell.homeManagerModules.default anki @@ -110,12 +66,50 @@ home-manager-laptop sbb-tui ssh thunderbird - #tomasr + tomasr vivify zoxide zsh zsh-laptop ]; + }; + flake.nixosModules.laptop = { ... }: { + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "25.11"; # Did you read the comment? + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + }; + flake.nixosModules.home-manager-laptop = { pkgs, ... }: { + imports = [ + inputs.home-manager.nixosModules.default # import official home-manager NixOS module + ]; + + # Warning. Git is used in case I break everything up. It already saved me once + environment.systemPackages = [ pkgs.git ]; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + extraSpecialArgs = { + pkgs-unstable = self.pkgs-unstable; + inherit self; + }; + }; + + users.users.tomasr = { + isNormalUser = true; + }; + home-manager.users.tomasr = self.homeModules.laptop; + }; + flake.homeModules.tomasr = { ... }: { + home.username = "tomasr"; home.homeDirectory = "/home/tomasr"; diff --git a/modules/hosts/test.nix b/modules/hosts/test.nix deleted file mode 100644 index 5317195..0000000 --- a/modules/hosts/test.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ inputs, ... }: { - -flake.modules.nixos.common = { ... }: { - - imports = [ inputs.home-manager.nixosModules.default ]; -}; - -}