From 1dcfaa82a9621b6f714bc2d4b0a4ff25ef5f946b Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 30 Apr 2025 11:08:01 -0400 Subject: [PATCH] updated --- dot_config/flake/flake.lock | 32 ++++++++++++++++---------------- dot_config/flake/flake.nix | 24 ++++++------------------ 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index 997401e..e89881e 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -75,11 +75,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745924915, - "narHash": "sha256-RuMUtaplJkaAtqkdG1+cD3trqmO2ykKqfK+3+HXPUVA=", + "lastModified": 1746023382, + "narHash": "sha256-AaT+V44rqEQbXvouwPnU7wJHiLR5Bq8uRvh7f+sOPgQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "329a9d639f0418cce05937a823f43b2b64191653", + "rev": "1d54ddac1e8db612bea4f279a0ea48ab35f420be", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1745977079, - "narHash": "sha256-eEOmrgpenIs+JwuCdqgEYly6sdz8vbCQVgvo8dk3DZM=", + "lastModified": 1745987135, + "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", "owner": "nix-community", "repo": "home-manager", - "rev": "84d262115e10ad321ef01cd85903d0f5c3ec113f", + "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", "type": "github" }, "original": { @@ -432,7 +432,7 @@ "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz" }, "original": { "type": "tarball", @@ -460,11 +460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -492,11 +492,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1745894113, - "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", + "lastModified": 1745980514, + "narHash": "sha256-CITAeiuXGjDvT5iZBXr6vKVWQwsUQLJUMFO91bfJFC4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", + "rev": "7fbdae44b0f40ea432e46fd152ad8be0f8f41ad6", "type": "github" }, "original": { diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index e171a3e..d47019d 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -2,7 +2,6 @@ description = "Home manager flake"; inputs = { - # nixpkgs.follows = "nixos-cosmic/nixpkgs-stable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; lix-module = { @@ -79,7 +78,7 @@ wash = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - # lix-module.nixosModules.default + lix-module.nixosModules.default stylix.nixosModules.stylix @@ -92,7 +91,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.backupFileExtension = "bak"; + # home-manager.backupFileExtension = "bak"; home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.users.tyler = import ./machines/wash/home.nix; } @@ -133,23 +132,12 @@ # modules = [./home/wash/wash.nix]; # }; - "tyler@wash" = home-manager.lib.homeManagerConfiguration { - pkgs = allPkgs."x86_64-linux"; - extraSpecialArgs = {inherit inputs outputs;}; - modules = [stylix.homeManagerModules.stylix ./home/wash/wash.nix]; - }; - - # "tyler@mal" = home-manager.lib.homeManagerConfiguration { - # pkgs = allPkgs; + # "tyler@wash" = home-manager.lib.homeManagerConfiguration { + # pkgs = allPkgs."x86_64-linux"; # extraSpecialArgs = {inherit inputs outputs;}; - # modules = [./home/mal/mal.nix]; + # modules = [stylix.homeManagerModules.stylix ./home/wash/wash.nix]; # }; - # "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration { - # pkgs = allPkgs."aarch64-darwin"; - # extraSpecialArgs = {inherit inputs outputs;}; - # modules = [./home/hinge/hinge.nix]; - # }; - }; + }; }; }