Kaynağa Gözat

feature: moved devenv to home-manager

Zander Hawke 10 ay önce
ebeveyn
işleme
3bb18ade8d
4 değiştirilmiş dosya ile 29 ekleme ve 26 silme
  1. 7 5
      devenv.nix
  2. 18 18
      flake.lock
  3. 4 1
      home/features/cli/default.nix
  4. 0 2
      hosts/meili/software.nix

+ 7 - 5
devenv.nix

@@ -5,22 +5,24 @@
     nixpkgs-fmt.enable = true;
   };
 
-  scripts = {
+  scripts = rec {
     update.exec = "nix flake update";
+    home-manager.exec = "${lib.getExe pkgs.home-manager} $@";
+    nixos-rebuild.exec = "${lib.getExe pkgs.nixos-rebuild} $@";
 
     hmb.exec = ''
-      ${lib.getExe pkgs.home-manager} build --flake .#$(whoami)@$(hostname);
+      ${home-manager.exec} build --flake .#$(whoami)@$(hostname);
     '';
     hms.exec = ''
-      ${lib.getExe pkgs.home-manager} switch --flake .#$(whoami)@$(hostname);
+      ${home-manager.exec} switch --flake .#$(whoami)@$(hostname);
       zen --ProfileManager
     '';
 
     nrb.exec = ''
-      ${lib.getExe pkgs.nixos-rebuild} build --flake .#$(hostname);
+      ${nixos-rebuild.exec} build --flake .#$(hostname);
     '';
     nrs.exec = ''
-      ${lib.getExe pkgs.nixos-rebuild} switch --flake .#$(hostname);
+      ${nixos-rebuild.exec} switch --flake .#$(hostname);
     '';
 
     drb.exec = ''

+ 18 - 18
flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753667201,
-        "narHash": "sha256-TwYZceH/tC83UCPwMWLk8v1AGHqkTuh1fi2c44UBMcg=",
+        "lastModified": 1754158015,
+        "narHash": "sha256-B/o0XiDj06Knm7t/9KmLKnkrpI9s5O13qU+SNL/4Gp8=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "4d584d7686a50387f975879788043e55af9f0ad4",
+        "rev": "062f3f42de2f6bb7382f88f6dbcbbbaa118a3791",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753675338,
-        "narHash": "sha256-KDS9sr7dddH97lUXa7oxfRqphBlCA6JxZO4m/Z4W06I=",
+        "lastModified": 1754174776,
+        "narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4b032ba5113664f0b8b23d956e59ce8e0bc349d",
+        "rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1754028485,
+        "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
         "type": "github"
       },
       "original": {
@@ -327,11 +327,11 @@
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1753634013,
-        "narHash": "sha256-DKW2YBGvrFxmbcGcjzq75YJJYCYUSOVq3vdXonLrM3E=",
+        "lastModified": 1754064298,
+        "narHash": "sha256-51/xBGL1NyXabL+8o+22NGBP40+8qMgoxm22M0ojrQA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "613ea8c1cfcf8fd760b9557426889e4483d6496f",
+        "rev": "6084e5b53c5f2d17132eef59f91cda7eb271449a",
         "type": "github"
       },
       "original": {
@@ -343,11 +343,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1753432016,
-        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
+        "lastModified": 1754151594,
+        "narHash": "sha256-S30TWshtDmNlU30u842RidFUraKj1f2dd4nrKRHm3gE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
+        "rev": "7b6929d8b900de3142638310f8bc40cff4f2c507",
         "type": "github"
       },
       "original": {
@@ -454,11 +454,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753674409,
-        "narHash": "sha256-jhBdIc802upDu3S/Nu0rgVlIJ39E8KWugQwm/a74MBY=",
+        "lastModified": 1754193284,
+        "narHash": "sha256-ZGLXnpXy7vcTDLC1yLQSJOclsilvK+RNFVVEeO0ei/0=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "e1bf71a0eb5ff9fdcfe83f6e4676ce19dd87f468",
+        "rev": "ac2b25e76f5bfe1e30ae39409dfa450c5c1bc945",
         "type": "github"
       },
       "original": {

+ 4 - 1
home/features/cli/default.nix

@@ -10,7 +10,10 @@
     ./tmux.nix
   ];
 
-  home.packages = [ pkgs.unstable.nak ];
+  home.packages = [
+    pkgs.unstable.devenv
+    pkgs.unstable.nak
+  ];
 
   programs.bash.enable = true;
   programs.direnv.enable = true;

+ 0 - 2
hosts/meili/software.nix

@@ -10,8 +10,6 @@
     ripgrep
     ollama
     rlama
-
-    unstable.devenv
   ];
 
   environment.shellInit = ''