From bbe9ec38dac2daa9d3b05c7cdea2727d6f752487 Mon Sep 17 00:00:00 2001 From: dish Date: Sun, 12 Oct 2025 00:48:43 -0400 Subject: [PATCH] [flake] more updates --- MIGRATE.md | 4 +- flake.lock | 146 ++++---- flake.nix | 12 +- homeModules/all-modules.nix | 1 - homeModules/profiles/gui/default.nix | 1 - homeModules/programs/zed-editor/settings.nix | 12 +- homeModules/services/default.nix | 1 - homeModules/services/vicinae/default.nix | 15 - homeModules/wayland/hyprland/default.nix | 1 - homeModules/wayland/hyprland/env.nix | 2 + homeModules/wayland/hyprland/hyprpanel.nix | 14 - homeModules/wayland/hyprland/keybindings.nix | 4 +- homeModules/wayland/hyprland/settings.nix | 3 - homeModules/wayland/hyprland/variables.nix | 6 +- hosts/zaphod/services/misc.nix | 2 +- .../thehedgehog-zaphod/caelestia-cli.json | 50 +++ .../thehedgehog-zaphod/caelestia-shell.json | 314 ++++++++++++++++++ .../homes/thehedgehog-zaphod/default.nix | 14 + 18 files changed, 463 insertions(+), 139 deletions(-) delete mode 100644 homeModules/services/vicinae/default.nix delete mode 100644 homeModules/wayland/hyprland/hyprpanel.nix create mode 100644 nixosModules/homes/thehedgehog-zaphod/caelestia-cli.json create mode 100644 nixosModules/homes/thehedgehog-zaphod/caelestia-shell.json diff --git a/MIGRATE.md b/MIGRATE.md index 790b3307..dcb5c508 100644 --- a/MIGRATE.md +++ b/MIGRATE.md @@ -1,5 +1,5 @@ -- [ ] easy-hosts -- [ ] HM Configs +- [x] easy-hosts +- [x] HM Configs - [x] modules - [x] packages - [x] devShells diff --git a/flake.lock b/flake.lock index 3ec18240..0bdbf7a4 100644 --- a/flake.lock +++ b/flake.lock @@ -50,6 +50,52 @@ "type": "github" } }, + "caelestia": { + "inputs": { + "caelestia-cli": "caelestia-cli", + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1760231944, + "narHash": "sha256-cZTyyHnZLAfdV3WO5QKZTKppBA7ksII9JHXU9cLZQZc=", + "owner": "caelestia-dots", + "repo": "shell", + "rev": "72d335d7c56d130f8008fa32e65c0b9ab69718e4", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "shell", + "type": "github" + } + }, + "caelestia-cli": { + "inputs": { + "caelestia-shell": [ + "caelestia" + ], + "nixpkgs": [ + "caelestia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760147156, + "narHash": "sha256-ad+1gnp7Lm7jVSzqvGjMiwnA0P61dFZmp6HcRMXicWY=", + "owner": "caelestia-dots", + "repo": "cli", + "rev": "e9668d58f51e935094e50090b99301df8344f590", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "cli", + "type": "github" + } + }, "ctp": { "inputs": { "nixpkgs": "nixpkgs" @@ -277,24 +323,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "golink": { "inputs": { "nixpkgs": [ @@ -435,26 +463,6 @@ "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" } }, - "iceshrimp": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721338360, - "narHash": "sha256-1CEhakLtPq+Lqo+p40wo00hkewmyzPAvjBr8ah6Faqk=", - "ref": "refs/heads/dev", - "rev": "98c3678cfbcea5e750a5947394d35a73ae72634a", - "revCount": 48, - "type": "git", - "url": "https://iceshrimp.dev/pyrox/packaging" - }, - "original": { - "type": "git", - "url": "https://iceshrimp.dev/pyrox/packaging" - } - }, "indigo": { "flake": false, "locked": { @@ -613,10 +621,32 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "caelestia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760228179, + "narHash": "sha256-4Z6k7lv3Zcgk3K+4h60LpqB9wCkR+utkYERU735U068=", + "ref": "refs/heads/master", + "rev": "c9d3ffb6043c5bf3f3009202bad7e0e5132c4a25", + "revCount": 693, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "agenix": "agenix", "buildbot-nix": "buildbot-nix", + "caelestia": "caelestia", "ctp": "ctp", "determinate": "determinate", "dix": "dix", @@ -627,13 +657,11 @@ "golink": "golink", "hardware": "hardware", "home-manager": "home-manager", - "iceshrimp": "iceshrimp", "my-pkgs": "my-pkgs", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", "nixpkgs-stalwart-fix": "nixpkgs-stalwart-fix", - "tangled": "tangled", - "vicinae": "vicinae" + "tangled": "tangled" } }, "sqlite-lib-src": { @@ -709,21 +737,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tangled": { "inputs": { "flake-compat": "flake-compat_2", @@ -750,27 +763,6 @@ "type": "git", "url": "https://tangled.org/@tangled.org/core" } - }, - "vicinae": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760025216, - "narHash": "sha256-gyRU+Xv8ABhiSTHFFllwMC7lLzINBiESDFlhZuQoIY0=", - "owner": "vicinaehq", - "repo": "vicinae", - "rev": "7757b8fc6ee8488a8cb27aca3260317132676540", - "type": "github" - }, - "original": { - "owner": "vicinaehq", - "repo": "vicinae", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 677279be..c17a24ae 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,10 @@ inputs.flake-parts.follows = "flake-parts"; inputs.treefmt-nix.follows = ""; }; + caelestia = { + url = "github:caelestia-dots/shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; ctp = { url = "github:catppuccin/nix"; }; @@ -77,10 +81,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - iceshrimp = { - url = "git+https://iceshrimp.dev/pyrox/packaging"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -89,10 +89,6 @@ url = "git+https://git.pyrox.dev/pyrox/pkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; - vicinae = { - url = "github:vicinaehq/vicinae"; - inputs.nixpkgs.follows = "nixpkgs"; - }; tangled = { url = "git+https://tangled.org/@tangled.org/core"; }; diff --git a/homeModules/all-modules.nix b/homeModules/all-modules.nix index b523be13..d804ed8c 100644 --- a/homeModules/all-modules.nix +++ b/homeModules/all-modules.nix @@ -11,6 +11,5 @@ inputs.nix-index-database.homeModules.nix-index inputs.ctp.homeModules.catppuccin - inputs.vicinae.homeManagerModules.default ]; } diff --git a/homeModules/profiles/gui/default.nix b/homeModules/profiles/gui/default.nix index 20c0541c..4202eafb 100644 --- a/homeModules/profiles/gui/default.nix +++ b/homeModules/profiles/gui/default.nix @@ -29,7 +29,6 @@ in kanshi.enable = mkDefault false; kdeconnect.enable = mkDefault true; mako.enable = mkDefault false; - vicinae.enable = mkDefault true; swayidle.enable = mkDefault true; syncthing.enable = mkDefault false; }; diff --git a/homeModules/programs/zed-editor/settings.nix b/homeModules/programs/zed-editor/settings.nix index 9de87248..7f36fd23 100644 --- a/homeModules/programs/zed-editor/settings.nix +++ b/homeModules/programs/zed-editor/settings.nix @@ -2,6 +2,7 @@ auto_update = false; buffer_font_family = "BlexMono Nerd Font"; buffer_font_size = 15; + disable_ai = true; git_panel.button = true; load_direnv = "direct"; lsp.deno.settings.deno.enable = true; @@ -15,17 +16,6 @@ vim_mode = true; wrap_guides = [ 100 ]; - assistant = { - enabled = false; - button = false; - version = "2"; - }; - - features = { - copilot = false; - edit_prediction_provider = "none"; - }; - icon_theme = { mode = "dark"; dark = "Catppuccin Mocha"; diff --git a/homeModules/services/default.nix b/homeModules/services/default.nix index 38ddc905..f899236c 100644 --- a/homeModules/services/default.nix +++ b/homeModules/services/default.nix @@ -6,6 +6,5 @@ ./mako ./swayidle ./syncthing - ./vicinae ]; } diff --git a/homeModules/services/vicinae/default.nix b/homeModules/services/vicinae/default.nix deleted file mode 100644 index d551786b..00000000 --- a/homeModules/services/vicinae/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - lib, - ... -}: -let - cfg = config.py.services.vicinae; -in -{ - options.py.services.vicinae.enable = lib.mkEnableOption "Vicinae"; - config.services.vicinae = lib.mkIf cfg.enable { - enable = true; - autoStart = true; - }; -} diff --git a/homeModules/wayland/hyprland/default.nix b/homeModules/wayland/hyprland/default.nix index abe149b4..139f4851 100644 --- a/homeModules/wayland/hyprland/default.nix +++ b/homeModules/wayland/hyprland/default.nix @@ -11,7 +11,6 @@ let in { imports = [ - ./hyprpanel.nix ./services.nix ./hypridle.nix ./hyprlock.nix diff --git a/homeModules/wayland/hyprland/env.nix b/homeModules/wayland/hyprland/env.nix index 65dbde47..606a28c6 100644 --- a/homeModules/wayland/hyprland/env.nix +++ b/homeModules/wayland/hyprland/env.nix @@ -5,5 +5,7 @@ "NIXOS_OZONE_WL, 1" "XDG_SESSION_TYPE, wayland" "QT_QPA_PLATFORM, wayland" + "XDG_CURRENT_DESKTOP, Hyprland" + "XDG_SESSION_DESKTOP, Hyprland" ]; } diff --git a/homeModules/wayland/hyprland/hyprpanel.nix b/homeModules/wayland/hyprland/hyprpanel.nix deleted file mode 100644 index 6b9778d6..00000000 --- a/homeModules/wayland/hyprland/hyprpanel.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - lib, - ... -}: -let - cfg = config.wayland.windowManager.hyprland; -in -{ - programs.hyprpanel = lib.mkIf cfg.enable { - enable = true; - systemd.enable = true; - }; -} diff --git a/homeModules/wayland/hyprland/keybindings.nix b/homeModules/wayland/hyprland/keybindings.nix index 178cb4eb..bb415e74 100644 --- a/homeModules/wayland/hyprland/keybindings.nix +++ b/homeModules/wayland/hyprland/keybindings.nix @@ -13,8 +13,8 @@ bind = [ "SUPER_SHIFT, F, exec, MOZ_DISABLE_RDD_SANDBOX=1 firefox" "$mod, Return, exec, ghostty" - "$mod, X, exec, wlogout" - "$mod, D, exec, vicinae toggle" + "$mod, X, global, caelestia:session" + "$mod, D, global, caelestia:launcher" "SUPER_SHIFT, E, exit" # Media Binds diff --git a/homeModules/wayland/hyprland/settings.nix b/homeModules/wayland/hyprland/settings.nix index f93f488d..d00cc520 100644 --- a/homeModules/wayland/hyprland/settings.nix +++ b/homeModules/wayland/hyprland/settings.nix @@ -7,9 +7,6 @@ let windowrules = import ./windowrules.nix; in { - exec-once = [ - "hyprpanel" - ]; animation = [ "global, 1, 4, default" ]; diff --git a/homeModules/wayland/hyprland/variables.nix b/homeModules/wayland/hyprland/variables.nix index fb2407d6..87bf10e9 100644 --- a/homeModules/wayland/hyprland/variables.nix +++ b/homeModules/wayland/hyprland/variables.nix @@ -2,8 +2,7 @@ { general = { gaps_in = 1; - gaps_out = 1; - gaps_workspaces = 80; + gaps_out = 10; layout = "hy3"; resize_on_border = true; }; @@ -26,6 +25,9 @@ tap-and-drag = false; }; }; + cursor = { + hotspot_padding = 2; + }; ecosystem = { no_update_news = true; no_donation_nag = true; diff --git a/hosts/zaphod/services/misc.nix b/hosts/zaphod/services/misc.nix index 293ea269..061cf2b0 100644 --- a/hosts/zaphod/services/misc.nix +++ b/hosts/zaphod/services/misc.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { services = { - blueman.enable = true; + blueman.enable = false; fstrim.enable = lib.mkDefault true; tlp.enable = lib.mkDefault ( (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") diff --git a/nixosModules/homes/thehedgehog-zaphod/caelestia-cli.json b/nixosModules/homes/thehedgehog-zaphod/caelestia-cli.json new file mode 100644 index 00000000..8f8ed518 --- /dev/null +++ b/nixosModules/homes/thehedgehog-zaphod/caelestia-cli.json @@ -0,0 +1,50 @@ +{ + "record": { + "extraArgs": [] + }, + "theme": { + "enableTerm": false, + "enableHypr": false, + "enableDiscord": false, + "enableSpicetify": false, + "enableFuzzel": false, + "enableBtop": true, + "enableGtk": false, + "enableQt": false + }, + "toggles": { + "communication": { + "discord": { + "enable": true, + "match": [ + { + "class": "equibop" + } + ], + "command": [ + "equibop" + ], + "move": true + } + }, + "sysmon": { + "btop": { + "enable": true, + "match": [ + { + "class": "btop", + "title": "btop", + "workspace": { + "name": "special:sysmon" + } + } + ], + "command": [ + "ghostty", + "-e", + "btop" + ] + } + } + } +} diff --git a/nixosModules/homes/thehedgehog-zaphod/caelestia-shell.json b/nixosModules/homes/thehedgehog-zaphod/caelestia-shell.json new file mode 100644 index 00000000..6964bc12 --- /dev/null +++ b/nixosModules/homes/thehedgehog-zaphod/caelestia-shell.json @@ -0,0 +1,314 @@ +{ + "appearance": { + "anim": { + "durations": { + "scale": 0.5 + } + }, + "font": { + "family": { + "clock": "Inter", + "material": "Material Symbols Rounded", + "mono": "BlexMono Nerd Font", + "sans": "Inter" + }, + "size": { + "scale": 1.1 + } + }, + "padding": { + "scale": 1 + }, + "rounding": { + "scale": 0 + }, + "spacing": { + "scale": 0.5 + }, + "transparency": { + "base": 0.85, + "enabled": false, + "layers": 0.4 + } + }, + "background": { + "desktopClock": { + "enabled": false + }, + "enabled": true, + "visualiser": { + "autoHide": true, + "enabled": false, + "rounding": 1, + "spacing": 1 + } + }, + "bar": { + "clock": { + "showIcon": false + }, + "dragThreshold": 20, + "entries": [ + { + "enabled": true, + "id": "workspaces" + }, + { + "enabled": true, + "id": "spacer" + }, + { + "enabled": false, + "id": "activeWindow" + }, + { + "enabled": true, + "id": "spacer" + }, + { + "enabled": true, + "id": "clock" + }, + { + "enabled": true, + "id": "statusIcons" + }, + { + "enabled": true, + "id": "tray" + }, + { + "enabled": true, + "id": "power" + } + ], + "persistent": true, + "scrollActions": { + "brightness": false, + "volume": false, + "workspaces": false + }, + "showOnHover": true, + "status": { + "showAudio": true, + "showBattery": true, + "showBluetooth": true, + "showKbLayout": false, + "showLockStatus": true, + "showMicrophone": false, + "showNetwork": true + }, + "tray": { + "background": true, + "compact": false, + "iconSubs": [], + "recolour": true + }, + "workspaces": { + "activeIndicator": true, + "activeLabel": "", + "activeTrail": false, + "label": " ", + "occupiedBg": false, + "occupiedLabel": "", + "perMonitorWorkspaces": true, + "showWindows": true, + "shown": 5 + } + }, + "border": { + "rounding": 0, + "thickness": 10 + }, + "dashboard": { + "dragThreshold": 50, + "enabled": true, + "mediaUpdateInterval": 500, + "showOnHover": true + }, + "general": { + "apps": { + "audio": ["pwvucontrol"], + "explorer": ["thunar"], + "playback": ["mpv"], + "terminal": ["ghostty"] + }, + "battery": { + "criticalLevel": 3, + "warnLevels": [ + { + "icon": "battery_android_frame_2", + "level": 20, + "message": "You might want to plug in a charger", + "title": "Low battery" + }, + { + "icon": "battery_android_frame_1", + "level": 10, + "message": "You should probably plug in a charger now", + "title": "Did you see the previous message?" + }, + { + "critical": true, + "icon": "battery_android_alert", + "level": 5, + "message": "PLUG THE CHARGER RIGHT NOW!!", + "title": "Critical battery level" + } + ] + }, + "idle": { + "inhibitWhenAudio": true, + "lockBeforeSleep": true, + "timeouts": [ + { + "idleAction": "lock", + "timeout": 180 + }, + { + "idleAction": "dpms off", + "returnAction": "dpms on", + "timeout": 300 + }, + { + "idleAction": ["systemctl", "suspend-then-hibernate"], + "timeout": 600 + } + ] + } + }, + "launcher": { + "actionPrefix": ">", + "actions": [ + { + "command": ["autocomplete", "calc"], + "dangerous": false, + "description": "Do simple math equations (powered by Qalc)", + "enabled": true, + "icon": "calculate", + "name": "Calculator" + }, + { + "command": ["systemctl", "poweroff"], + "dangerous": true, + "description": "Shutdown the system", + "enabled": true, + "icon": "power_settings_new", + "name": "Shutdown" + }, + { + "command": ["systemctl", "reboot"], + "dangerous": true, + "description": "Reboot the system", + "enabled": true, + "icon": "cached", + "name": "Reboot" + }, + { + "command": ["loginctl", "terminate-user", ""], + "dangerous": true, + "description": "Log out of the current session", + "enabled": true, + "icon": "exit_to_app", + "name": "Logout" + }, + { + "command": ["loginctl", "lock-session"], + "dangerous": false, + "description": "Lock the current session", + "enabled": true, + "icon": "lock", + "name": "Lock" + }, + { + "command": ["systemctl", "suspend-then-hibernate"], + "dangerous": false, + "description": "Suspend then hibernate", + "enabled": true, + "icon": "bedtime", + "name": "Sleep" + } + ], + "dragThreshold": 50, + "enableDangerousActions": false, + "hiddenApps": [], + "maxShown": 7, + "maxWallpapers": 9, + "showOnHover": false, + "specialPrefix": "@", + "useFuzzy": { + "actions": false, + "apps": true, + "schemes": false, + "variants": false, + "wallpapers": false + }, + "vimKeybinds": true + }, + "lock": { + "recolourLogo": false + }, + "notifs": { + "actionOnClick": true, + "clearThreshold": 0.3, + "defaultExpireTimeout": 5000, + "expandThreshold": 20, + "expire": true + }, + "osd": { + "enableBrightness": true, + "enableMicrophone": false, + "enabled": true, + "hideDelay": 2000 + }, + "paths": { + "mediaGif": "", + "sessionGif": "", + "wallpaperDir": "~/bgs/wallpapers/xenia/" + }, + "services": { + "audioIncrement": 0.1, + "defaultPlayer": "Spotify", + "gpuType": "", + "playerAliases": [ + { + "from": "Mozilla firefox", + "to": "Firefox" + } + ], + "smartScheme": false, + "useFahrenheit": true, + "useTwelveHourClock": false, + "visualiserBars": 0, + "weatherLocation": "Norfolk+Virginia" + }, + "session": { + "commands": { + "hibernate": ["systemctl", "hibernate"], + "logout": ["loginctl", "terminate-user", ""], + "reboot": ["systemctl", "reboot"], + "shutdown": ["systemctl", "poweroff"] + }, + "dragThreshold": 30, + "enabled": true, + "vimKeybinds": false + }, + "sidebar": { + "dragThreshold": 80, + "enabled": true + }, + "utilities": { + "enabled": true, + "maxToasts": 4, + "toasts": { + "audioInputChanged": true, + "audioOutputChanged": true, + "capsLockChanged": true, + "chargingChanged": true, + "configLoaded": true, + "dndChanged": true, + "gameModeChanged": true, + "numLockChanged": true + } + } +} diff --git a/nixosModules/homes/thehedgehog-zaphod/default.nix b/nixosModules/homes/thehedgehog-zaphod/default.nix index 6deb1d4b..f2edf28e 100644 --- a/nixosModules/homes/thehedgehog-zaphod/default.nix +++ b/nixosModules/homes/thehedgehog-zaphod/default.nix @@ -1,6 +1,7 @@ { pkgs, config, + inputs, ... }: let @@ -8,6 +9,9 @@ let in { home-manager.users.thehedgehog = { + imports = [ + inputs.caelestia.homeManagerModules.default + ]; home.packages = [ pkgs.mindustry pkgs.signal-desktop @@ -61,5 +65,15 @@ in }; } ]; + programs.caelestia = { + enable = true; + settings = builtins.fromJSON (builtins.readFile ./caelestia-shell.json); + systemd = { + enable = true; + target = "graphical-session.target"; + }; + cli.enable = true; + cli.settings = builtins.fromJSON (builtins.readFile ./caelestia-cli.json); + }; }; } -- 2.51.2