diff --git a/flake.lock b/flake.lock index e36ab89..94e4e10 100644 --- a/flake.lock +++ b/flake.lock @@ -2204,11 +2204,11 @@ ] }, "locked": { - "lastModified": 1794340426, - "narHash": "sha256-pI+lgRUmAPhK60//MS5Tp8B53EK+AZJ3U0yTcNBbRto=", + "lastModified": 1794409204, + "narHash": "sha256-N56Hhd34Ovw8MH7L63LpknieCCvyW+2YOBQE+/jZB9s=", "ref": "refs/heads/main", - "rev": "409ae5453031438d1b6dc0ddf1e9965c7d2b7fed", - "revCount": 1222, + "rev": "a82206f0a8d7339e210fc9595ef53d9d8316ae86", + "revCount": 1280, "type": "git", "url": "ssh://git@github.com/asosnovsky/nbot.git" }, diff --git a/hosts/fwbook/default.nix b/hosts/fwbook/default.nix index 02d81d2..713af75 100644 --- a/hosts/fwbook/default.nix +++ b/hosts/fwbook/default.nix @@ -7,6 +7,7 @@ ./networking.nix ./hardware.nix ./systemd.nix + ./omarchy.nix ]; skyg = { diff --git a/hosts/fwbook/omarchy.nix b/hosts/fwbook/omarchy.nix new file mode 100644 index 0000000..094ea38 --- /dev/null +++ b/hosts/fwbook/omarchy.nix @@ -0,0 +1,34 @@ +{ pkgs, nixarchy, skygUtils, config, ... }: +let + # Omarchy shell build + dedent = "${pkgs.gawk}/bin/awk 'BEGIN{m=9999} {l[NR]=$0; match($0,/^ */); if ($0 ~ /[^ ]/ && RLENGTH configs/fwbook/omarchy + system.userActivationScripts.omarchyConfig.text = + skygUtils.makeHyperlinkScriptToConfigs { + filePath = "fwbook/omarchy"; + targetPath = "omarchy"; + configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; + }; + + # Packages + environment.systemPackages = + [ omarchy ] + ++ omarchyRuntime; +} diff --git a/hosts/fwbook/packages.nix b/hosts/fwbook/packages.nix index a5c992b..6945070 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -1,16 +1,5 @@ -{ pkgs, unstablePkgs, nixarchy, skygUtils, config, nbot, ... }: +{ pkgs, unstablePkgs, nbot, ... }: let - dedent = "${pkgs.gawk}/bin/awk 'BEGIN{m=9999} {l[NR]=$0; match($0,/^ */); if ($0 ~ /[^ ]/ && RLENGTH configs/fwbook/omarchy (same pattern as hypr/noctalia). - system.userActivationScripts.omarchyConfig.text = - skygUtils.makeHyperlinkScriptToConfigs { - filePath = "fwbook/omarchy"; - targetPath = "omarchy"; - configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; - }; - environment.systemPackages = - [ omarchy ] - ++ omarchyRuntime - ++ (with pkgs; [ + (with pkgs; [ + # Desktop & theme glib gsettings-desktop-schemas gnome-themes-extra yaru-theme adwaita-icon-theme - ]) - ++ (with pkgs; [ + oreo-cursors-plus + + # Screen & images grim slurp wl-clipboard - tesseract + wl-screenrec + gpu-screen-recorder + gifski imagemagick zbar - curl - translate-shell - wl-screenrec + tesseract + + # Media & creative + obs-studio + davinci-resolve-wrapped + shotcut ffmpeg - gifski - libusb1 - lshw - jq - parted - gparted-full - f3 - nixd - kdePackages.qtdeclarative + krita + gimp-with-plugins + simple-scan + orca-slicer + + # Chat & meetings + zoom-us + discord + betterdiscordctl + signal-desktop + telegram-desktop + unstablePkgs.slack + + # Office + onlyoffice-desktopeditors + darling-dmg piper-tts - ffmpeg - oreo-cursors-plus - - postgresql - google-cloud-sdk - awscli - openfortivpn - openfortivpn-webview - openfortivpn-webview-qt - nodejs + # Wine wineWow64Packages.stable winetricks wineWow64Packages.waylandFull - obs-studio - davinci-resolve-wrapped + # Cloud, VPN & data + postgresql + google-cloud-sdk + gdk + awscli + openfortivpn + openfortivpn-webview + openfortivpn-webview-qt + bitwarden-cli - krita - gimp-with-plugins - shotcut - simple-scan - - zoom-us - betterdiscordctl - discord - signal-desktop - telegram-desktop + # Disks & hardware + libusb1 + lshw + parted + gparted-full + f3 + rpi-imager + rpiboot + libimobiledevice + ifuse + idevicerestore + # Languages & dev tools + nodejs python313 python314 uv + pipx cargo rustc go - pipx rust-analyzer + nixd + kdePackages.qtdeclarative + just + devcontainer + devenv + flox_dev + nix-prefetch + gh + bubblewrap + delta-editor + # Editors vscode unstablePkgs.zed-editor-fhs - unstablePkgs.et - unstablePkgs.devenv - just - rpi-imager - rpiboot code-cursor-fhs - nix-prefetch - orca-slicer - devcontainer - gpu-screen-recorder - flox_dev - - darling-dmg - - bitwarden-cli - - onlyoffice-desktopeditors - - gh - gdk - unstablePkgs.slack - - libimobiledevice - ifuse - - idevicerestore + # Agents & LLM tools + unstablePkgs.claude-code + unstablePkgs.claude-agent-acp unstablePkgs.grok-build unstablePkgs.pi-coding-agent unstablePkgs.goose-cli - unstablePkgs.claude-agent-acp - unstablePkgs.claude-code - buzz-desktop - bubblewrap - delta-editor herdr nbot.packages.${pkgs.stdenv.hostPlatform.system}.nbot-wf - - skygqts hermenix + pi-coding-agent + + # Remote & CLI tools + unstablePkgs.et + curl + jq + translate-shell + buzz-desktop + skygqts ]); }