diff --git a/configs/fwbook/hypr/conf/general.lua b/configs/fwbook/hypr/conf/general.lua index d586374..b65a7da 100644 --- a/configs/fwbook/hypr/conf/general.lua +++ b/configs/fwbook/hypr/conf/general.lua @@ -22,7 +22,7 @@ hl.config({ }, scrolling = { - column_width = 1, + column_width = 0.5, fullscreen_on_one_column = true, focus_fit_method = 0, follow_focus = true, diff --git a/configs/fwbook/hypr/conf/window-rules.lua b/configs/fwbook/hypr/conf/window-rules.lua index ced6f3a..3519ecc 100644 --- a/configs/fwbook/hypr/conf/window-rules.lua +++ b/configs/fwbook/hypr/conf/window-rules.lua @@ -1,9 +1,13 @@ -- ========================= -- Window Rules -- ========================= --- Rounding/clip is handled globally in general.lua (decoration.rounding = 12), --- mirroring the niri window-rule. Below: float the small control/dialog --- utilities so they don't tile. + +hl.window_rule({ + match = { class = "com.mitchellh.ghostty" }, + fullscreen = false, + size = { "(monitor_w*0.5)", "(monitor_h)" }, + name = "ghostty-init", +}) hl.window_rule({ name = "float-pavucontrol", diff --git a/flake.lock b/flake.lock index c43c8ce..873a05b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,24 @@ "type": "github" } }, + "ai-usagebar": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1790367912, + "narHash": "sha256-3UlzBdnP9NHjNwjD8lp0VTuDjdqWgxCTSehwxCejaxg=", + "owner": "akitaonrails", + "repo": "ai-usagebar", + "rev": "cb9618613d8df82228bde49250b45cc4d2e928b9", + "type": "github" + }, + "original": { + "owner": "akitaonrails", + "repo": "ai-usagebar", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -400,7 +418,7 @@ "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux_2", "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux_2", "nix": "nix_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1788427446, @@ -765,7 +783,7 @@ "inputs": { "crane": "crane", "fenix": "fenix", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -972,7 +990,7 @@ }, "herdr": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { @@ -995,7 +1013,7 @@ "devenv": "devenv", "git-hooks": "git-hooks_3", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nutest": "nutest", "treefmt-nix": "treefmt-nix_2" }, @@ -1017,7 +1035,7 @@ "inputs": { "flake-parts": "flake-parts_4", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", @@ -1198,7 +1216,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_2", "xdph": "xdph" @@ -1387,7 +1405,7 @@ "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwire": "hyprwire_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "systems": "systems_3" }, "locked": { @@ -1676,7 +1694,7 @@ "inputs": { "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, @@ -1753,7 +1771,7 @@ "inputs": { "flake-parts": "flake-parts_2", "git-hooks-nix": "git-hooks-nix_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-23-11": "nixpkgs-23-11_2", "nixpkgs-regression": "nixpkgs-regression_2" }, @@ -1883,7 +1901,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1789127271, @@ -1995,6 +2013,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1789684949, + "narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e554fab72f81915600f3f449b786fd9af40439a5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1786247143, "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", @@ -2010,7 +2044,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -2023,7 +2057,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1789009968, "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", @@ -2038,6 +2072,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1787323337, + "narHash": "sha256-PqomwlB2WugM9MC4tV1L2/yosMOfug3KBDjmqOqD1bU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6062ba1a1b8b6281b12533c9075a2dbeb38f7e49", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1787962033, "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", @@ -2051,7 +2101,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1774386573, "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", @@ -2067,7 +2117,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1779911860, "narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=", @@ -2083,7 +2133,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1787962033, "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", @@ -2097,7 +2147,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1787498568, "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", @@ -2111,7 +2161,7 @@ "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1789286504, "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", @@ -2125,7 +2175,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1785318670, "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", @@ -2141,22 +2191,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1789684949, - "narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e554fab72f81915600f3f449b786fd9af40439a5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -2338,6 +2372,7 @@ "root": { "inputs": { "agenix": "agenix", + "ai-usagebar": "ai-usagebar", "dank-greeter": "dank-greeter", "determinate": "determinate", "disko": "disko", @@ -2355,7 +2390,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "skygqts": "skygqts", diff --git a/flake.nix b/flake.nix index 7eb75d3..d58828a 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; herdr.url = "github:herdrdev/herdr"; + ai-usagebar.url = "github:akitaonrails/ai-usagebar"; # Declarative disk partitioning (for nixos-anywhere installs) disko = { url = "github:nix-community/disko"; @@ -106,6 +107,7 @@ , tether , herdr , disko + , ai-usagebar }: let # Libs @@ -159,6 +161,7 @@ determinate tether herdr + ai-usagebar ; }; } diff --git a/hosts/fwbook/packages.nix b/hosts/fwbook/packages.nix index 7ed5bd6..eddea6c 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, unstablePkgs, ... }: +{ pkgs, unstablePkgs, ai-usagebar, ... }: { environment.systemPackages = let @@ -118,6 +118,7 @@ delta-editor herdr superset-desktop + ai-usagebar.packages.${pkgs.stdenv.hostPlatform.system}.default skygqts hermenix diff --git a/hosts/hl-minipc1/hardware-configuration/boot.nix b/hosts/hl-minipc1/hardware-configuration/boot.nix index 81b6217..72fa4ca 100644 --- a/hosts/hl-minipc1/hardware-configuration/boot.nix +++ b/hosts/hl-minipc1/hardware-configuration/boot.nix @@ -5,6 +5,9 @@ { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ];