From cec42ccf0aa01455d64253a3f6893d557bcef3f9 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 24 Nov 2025 09:06:02 -0500 Subject: [PATCH] latest --- flake.lock | 310 ++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 + hosts/fwbook.nix | 10 +- 3 files changed, 317 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 47808b2..79c2533 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprlauncher", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprlauncher", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -283,6 +316,243 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprlauncher", + "hyprutils" + ], + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprlauncher", + "hyprutils" + ], + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprlauncher", + "hyprtoolkit", + "hyprutils" + ], + "nixpkgs": [ + "hyprlauncher", + "hyprtoolkit", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "hyprtoolkit", + "systems" + ] + }, + "locked": { + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlauncher": { + "inputs": { + "aquamarine": "aquamarine", + "hyprgraphics": "hyprgraphics", + "hyprlang": "hyprlang", + "hyprtoolkit": "hyprtoolkit", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", + "nixpkgs": "nixpkgs_3", + "systems": "systems" + }, + "locked": { + "lastModified": 1763819300, + "narHash": "sha256-WBTSRJ0PrVW+zDmTraJFXsAKPrYn01VgXvEtcixIEsQ=", + "owner": "hyprwm", + "repo": "hyprlauncher", + "rev": "53a6b3f2d7f6e3981347ddaaf469b16964287fc2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlauncher", + "type": "github" + } + }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprlauncher", + "aquamarine" + ], + "hyprgraphics": [ + "hyprlauncher", + "hyprgraphics" + ], + "hyprlang": "hyprlang_2", + "hyprutils": [ + "hyprlauncher", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprlauncher", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1762779491, + "narHash": "sha256-M+mlYKvzqW+TSoJ4MH9U+HcFoUmWc1etiXehyLEVB2M=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "2af07d3fd4d165caee160aab96810c54d81e88c2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1762812168, + "narHash": "sha256-pY+dUqi2AYpH0HHT2JFzt1qWoJQBWtBdzzcL1ZK5Mwo=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "cb3e797fde5c748164eb70d9859336141136a166", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprlauncher", + "hyprutils" + ], + "nixpkgs": [ + "hyprlauncher", + "nixpkgs" + ], + "systems": [ + "hyprlauncher", + "systems" + ] + }, + "locked": { + "lastModified": 1761653508, + "narHash": "sha256-EoLyrxFJVr7igDhhVNRk2rRpEEOJllRWvYg5XZ3J5y0=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "a5946085ab7705d7b75b77a91ce8fca7faf0dc34", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "nix": { "inputs": { "flake-parts": "flake-parts", @@ -431,6 +701,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1761597516, "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", @@ -474,13 +760,14 @@ "inputs": { "determinate": "determinate", "home-manager": "home-manager", + "hyprlauncher": "hyprlauncher", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "stylix": "stylix", - "systems": "systems_2" + "systems": "systems_3" } }, "stylix": { @@ -496,7 +783,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -519,6 +806,21 @@ } }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -533,7 +835,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 6fe60fa..4a06723 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; + # Hyprland + hyprlauncher.url = "github:hyprwm/hyprlauncher"; }; outputs = @@ -37,6 +39,7 @@ , nix-darwin , nix-flatpak , stylix + , hyprlauncher }: let user = { @@ -86,6 +89,7 @@ inputs = { inherit + hyprlauncher nixpkgs-unstable; }; }; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 454f195..cce199b 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,5 +1,5 @@ { user }: -{ pkgs, ... }: +{ pkgs, hyprlauncher, system, ... }: let zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; zshFunctions = zshFWBook + "/functions.sh"; @@ -147,6 +147,7 @@ in krita gimp-with-plugins shotcut + simple-scan # scanning photos # socials zoom-us @@ -164,9 +165,9 @@ in pipx rust-analyzer - # development + # Development vscode - zed-editor-fhs + zed-editor devenv just rpi-imager @@ -195,6 +196,9 @@ in # Iphone Management idevicerestore # optional, to mount using 'ifuse' + + # Misc + # hyprlauncher.packages.${system}.hyprlauncher ]); services.usbmuxd.enable = true; services.flatpak.packages = [