diff --git a/flake.lock b/flake.lock index 8680d9e..9140dbc 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hLYL3Er7tcQmV8I1EuRRTmU1hHJ58EA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,17 +20,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748707769, - "narHash": "sha256-pending-run-nix-flake-update", + "lastModified": 1780749050, + "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "type": "github" }, "original": { "owner": "nixos", - "repo": "nixpkgs", "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, @@ -43,7 +43,7 @@ "systems": { "locked": { "lastModified": 1681028828, - "narHash": "sha256-Vy12ghalO9X1K6PDcKmM7URBQRdkelmlmAC5XhUltA=", + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", "repo": "default", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", diff --git a/flake.nix b/flake.nix index c27a0c1..acc5c62 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,21 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; + + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: + outputs = + { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -87,7 +97,7 @@ # ── The Brain Shell package ──────────────────────────────────────── brain-shell = pkgs.stdenv.mkDerivation { - pname = "brain-shell"; + pname = "brain-shell"; version = "0.1.0"; src = ./.; @@ -111,11 +121,11 @@ ''; meta = with pkgs.lib; { - description = "A modular Quickshell/QML desktop shell for Hyprland"; - homepage = "https://github.com/Brainitech/Brain_Shell"; - license = licenses.mit; - platforms = platforms.linux; - mainProgram = "brain-shell"; + description = "A modular Quickshell/QML desktop shell for Hyprland"; + homepage = "https://github.com/Brainitech/Brain_Shell"; + license = licenses.mit; + platforms = platforms.linux; + mainProgram = "brain-shell"; }; }; @@ -123,7 +133,7 @@ { # ── Packages ─────────────────────────────────────────────────────── packages = { - default = brain-shell; + default = brain-shell; brain-shell = brain-shell; }; @@ -146,14 +156,22 @@ }; # ── NixOS module ─────────────────────────────────────────────────── - nixosModules.default = { config, lib, pkgs, ... }: - let cfg = config.programs.brain-shell; - in { + nixosModules.default = + { + config, + lib, + pkgs, + ... + }: + let + cfg = config.programs.brain-shell; + in + { options.programs.brain-shell = { enable = lib.mkEnableOption "Brain Shell desktop shell"; autostart = lib.mkOption { - type = lib.types.bool; + type = lib.types.bool; default = true; description = "Add brain-shell to Hyprland exec-once."; }; @@ -162,16 +180,18 @@ config = lib.mkIf cfg.enable { environment.systemPackages = [ brain-shell ]; - wayland.windowManager.hyprland.settings = lib.mkIf cfg.autostart { - exec-once = [ - "brain-shell" - "hypridle" - "awww-daemon" - "systemctl --user start hyprpolkitagent" - "wl-paste --type text --watch cliphist store" - "wl-paste --type image --watch cliphist store" - ]; - }; + # This can't even be configured this way, so just tell the user to manually add it to their config or something. + + # wayland.windowManager.hyprland.settings = lib.mkIf cfg.autostart { + # exec-once = [ + # "brain-shell" + # "hypridle" + # "awww-daemon" + # "systemctl --user start hyprpolkitagent" + # "wl-paste --type text --watch cliphist store" + # "wl-paste --type image --watch cliphist store" + # ]; + # }; }; };