Browse Source

fix: upgrades to fix some instability issues

Zander Hawke 5 months ago
parent
commit
65fde7fbdd
2 changed files with 73 additions and 47 deletions
  1. 36 36
      flake.lock
  2. 37 11
      home/features/desktop/aerospace.nix

+ 36 - 36
flake.lock

@@ -112,11 +112,11 @@
         ]
         ]
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1768406370,
-        "narHash": "sha256-9aWoZQMzE0lBE2EFSCHAI4Zue+jpL/DF13UGf6zfOr8=",
+        "lastModified": 1768738650,
+        "narHash": "sha256-oe9/b2DkYNlGg1GdX7n8U87y49CvXHED7nMGEE3WzjI=",
         "owner": "cachix",
         "owner": "cachix",
         "repo": "devenv",
         "repo": "devenv",
-        "rev": "9487ba6df6cbbfb59c051f9410cdc4521a4471ed",
+        "rev": "43328b8bc4096055622390ee4fc21b5977aab2e3",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -132,11 +132,11 @@
         ]
         ]
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1766150702,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "lastModified": 1768727946,
+        "narHash": "sha256-le2GY+ZR6uRHMuOAc60sBR3gBD2BEk1qOZ3S5C/XFpU=",
         "owner": "nix-community",
         "owner": "nix-community",
         "repo": "disko",
         "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "558e84658d0eafc812497542ad6ca0d9654b3b0f",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -153,11 +153,11 @@
       },
       },
       "locked": {
       "locked": {
         "dir": "pkgs/firefox-addons",
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1768449815,
-        "narHash": "sha256-ldbEmjXbSZ3KRWgWAqBv7b0R6r/KE/Shdf7P2shLoHM=",
+        "lastModified": 1768709017,
+        "narHash": "sha256-/Xc5B/+6nbX24iSaPbN/+wiVqGS50/LS4y53tzTvN0o=",
         "owner": "rycee",
         "owner": "rycee",
         "repo": "nur-expressions",
         "repo": "nur-expressions",
-        "rev": "8ab73ae7afde9968632293842cc546884b692c41",
+        "rev": "5728e3d62c3af09445cb013e304d627f6589efc4",
         "type": "gitlab"
         "type": "gitlab"
       },
       },
       "original": {
       "original": {
@@ -375,11 +375,11 @@
         ]
         ]
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1768434960,
-        "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=",
+        "lastModified": 1768749864,
+        "narHash": "sha256-EKRMFBLBRCHrFZ5luX85RTnsN3b2q3FjZEi62vXwJBE=",
         "owner": "nix-community",
         "owner": "nix-community",
         "repo": "home-manager",
         "repo": "home-manager",
-        "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b",
+        "rev": "5148e08046dc8c74c66b8aee4d302a47d6931b56",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -397,11 +397,11 @@
         ]
         ]
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1747978958,
-        "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
         "owner": "nix-community",
         "owner": "nix-community",
         "repo": "home-manager",
         "repo": "home-manager",
-        "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -416,11 +416,11 @@
         "nixpkgs": "nixpkgs"
         "nixpkgs": "nixpkgs"
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1767822991,
-        "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=",
+        "lastModified": 1768749749,
+        "narHash": "sha256-LznsuRIp4RyjOy6EuHYbmgMx9MQ2lUSH3ymfNPE+O9w=",
         "owner": "nix-community",
         "owner": "nix-community",
         "repo": "impermanence",
         "repo": "impermanence",
-        "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5",
+        "rev": "7d905a5a23f26b62c5b68129ef3780409088327a",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -455,11 +455,11 @@
         ]
         ]
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1768322802,
-        "narHash": "sha256-8/Ye9hw1SFXn+odPhZcISZyErFloPZLATI6VMjwzPps=",
+        "lastModified": 1768491252,
+        "narHash": "sha256-ZlIPlKCYXwQJsw9WYVeyCapF5Y8JZL2Hctf22+IbHqo=",
         "owner": "cachix",
         "owner": "cachix",
         "repo": "nix",
         "repo": "nix",
-        "rev": "4cbf6a9e07dc2eb035865cde51e74217862573a1",
+        "rev": "9f0da1cd90b271569752a4c83f3ff700b8fcbe12",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -513,11 +513,11 @@
     },
     },
     "nixpkgs": {
     "nixpkgs": {
       "locked": {
       "locked": {
-        "lastModified": 1748026106,
-        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "nixos",
         "owner": "nixos",
         "repo": "nixpkgs",
         "repo": "nixpkgs",
-        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -545,11 +545,11 @@
     },
     },
     "nixpkgs-unstable": {
     "nixpkgs-unstable": {
       "locked": {
       "locked": {
-        "lastModified": 1768395095,
-        "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
+        "lastModified": 1768661221,
+        "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=",
         "owner": "nixos",
         "owner": "nixos",
         "repo": "nixpkgs",
         "repo": "nixpkgs",
-        "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
+        "rev": "3327b113f2ef698d380df83fbccefad7e83d7769",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -561,11 +561,11 @@
     },
     },
     "nixpkgs_2": {
     "nixpkgs_2": {
       "locked": {
       "locked": {
-        "lastModified": 1768323494,
-        "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=",
+        "lastModified": 1768621446,
+        "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=",
         "owner": "nixos",
         "owner": "nixos",
         "repo": "nixpkgs",
         "repo": "nixpkgs",
-        "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a",
+        "rev": "72ac591e737060deab2b86d6952babd1f896d7c5",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -584,11 +584,11 @@
         "systems": "systems_2"
         "systems": "systems_2"
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1767906546,
-        "narHash": "sha256-AoSWS8+P+7hQ/jIdv0wBjgH1MvnerdWBFXO4GV3JoQs=",
+        "lastModified": 1768486009,
+        "narHash": "sha256-I7ymDe6UQooHy9I9wrafKCCDnRbox/EMWAgJgpm7fGs=",
         "owner": "nix-community",
         "owner": "nix-community",
         "repo": "nixvim",
         "repo": "nixvim",
-        "rev": "7eb8f36f085b85a2aeff929aff52d0f6aa14e000",
+        "rev": "03a638205b5cb04ba9c2ed6c604e137b15f07fa1",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {
@@ -694,11 +694,11 @@
         ]
         ]
       },
       },
       "locked": {
       "locked": {
-        "lastModified": 1768379550,
-        "narHash": "sha256-z94S29l5V86h11LZbPIMbHTJyksDG63aqISsZkTTuJY=",
+        "lastModified": 1768711359,
+        "narHash": "sha256-3n2ixvAMWij1ZOh/KMJJqizX+sRU083wFR8pa6+IkyU=",
         "owner": "0xc000022070",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
         "repo": "zen-browser-flake",
-        "rev": "06f61b4e4f4f6ba8027c96a5611c63dc0db12b90",
+        "rev": "8c9e9425946f290fa60e0e6fd7b1464cbcdbc53e",
         "type": "github"
         "type": "github"
       },
       },
       "original": {
       "original": {

+ 37 - 11
home/features/desktop/aerospace.nix

@@ -1,6 +1,7 @@
-{ pkgs
-, lib
-, ...
+{
+  pkgs,
+  lib,
+  ...
 }:
 }:
 let
 let
   aerospace-focus = "${lib.getExe pkgs.aerospace-tmux-focus}";
   aerospace-focus = "${lib.getExe pkgs.aerospace-tmux-focus}";
@@ -11,6 +12,7 @@ in
   programs.aerospace = {
   programs.aerospace = {
     enable = true;
     enable = true;
     launchd.enable = true;
     launchd.enable = true;
+    package = pkgs.unstable.aerospace;
 
 
     settings = {
     settings = {
       mode.main.binding = {
       mode.main.binding = {
@@ -47,14 +49,38 @@ in
         ctrl-shift-8 = "move-node-to-workspace 8";
         ctrl-shift-8 = "move-node-to-workspace 8";
 
 
         # follow window to workspace
         # follow window to workspace
-        ctrl-cmd-1 = [ "move-node-to-workspace 1" "workspace 1" ];
-        ctrl-cmd-2 = [ "move-node-to-workspace 2" "workspace 2" ];
-        ctrl-cmd-3 = [ "move-node-to-workspace 3" "workspace 3" ];
-        ctrl-cmd-4 = [ "move-node-to-workspace 4" "workspace 4" ];
-        ctrl-cmd-5 = [ "move-node-to-workspace 5" "workspace 5" ];
-        ctrl-cmd-6 = [ "move-node-to-workspace 6" "workspace 6" ];
-        ctrl-cmd-7 = [ "move-node-to-workspace 7" "workspace 7" ];
-        ctrl-cmd-8 = [ "move-node-to-workspace 8" "workspace 8" ];
+        ctrl-cmd-1 = [
+          "move-node-to-workspace 1"
+          "workspace 1"
+        ];
+        ctrl-cmd-2 = [
+          "move-node-to-workspace 2"
+          "workspace 2"
+        ];
+        ctrl-cmd-3 = [
+          "move-node-to-workspace 3"
+          "workspace 3"
+        ];
+        ctrl-cmd-4 = [
+          "move-node-to-workspace 4"
+          "workspace 4"
+        ];
+        ctrl-cmd-5 = [
+          "move-node-to-workspace 5"
+          "workspace 5"
+        ];
+        ctrl-cmd-6 = [
+          "move-node-to-workspace 6"
+          "workspace 6"
+        ];
+        ctrl-cmd-7 = [
+          "move-node-to-workspace 7"
+          "workspace 7"
+        ];
+        ctrl-cmd-8 = [
+          "move-node-to-workspace 8"
+          "workspace 8"
+        ];
 
 
         # window management
         # window management
         ctrl-q = "close";
         ctrl-q = "close";