diff --git a/flake.lock b/flake.lock index b437982..9b41556 100644 --- a/flake.lock +++ b/flake.lock @@ -1450,6 +1450,31 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "xdg-desktop-portal-hyprland", + "nixpkgs" + ], + "systems": [ + "xdg-desktop-portal-hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "icon-picker-nvim": { "flake": false, "locked": { @@ -2295,6 +2320,22 @@ "type": "github" } }, + "nixpkgs_16": { + "locked": { + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1689444953, @@ -3008,7 +3049,8 @@ "nur": "nur", "schizofox": "schizofox", "shadower": "shadower", - "split-monitor-workspaces": "split-monitor-workspaces" + "split-monitor-workspaces": "split-monitor-workspaces", + "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" } }, "rust-analyzer-src": { @@ -3392,6 +3434,21 @@ "type": "github" } }, + "systems_9": { + "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" + } + }, "tabular": { "flake": false, "locked": { @@ -3746,6 +3803,26 @@ "type": "gitlab" } }, + "xdg-desktop-portal-hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "nixpkgs": "nixpkgs_16", + "systems": "systems_9" + }, + "locked": { + "lastModified": 1697281098, + "narHash": "sha256-yKrV/2lwKUZnzLUneI9x8CtiD4WTGLIJ4hNjxAmaySw=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "d8daa2a84f5e9b38eb89e0631b294e7d0a83aa9b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index c13a649..507de51 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,8 @@ hyprland.url = "github:hyprwm/Hyprland"; + xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; + hyprcontrib.url = "github:hyprwm/contrib"; hyprland-plugins = { diff --git a/modules/gui/hyprland.nix b/modules/gui/hyprland.nix index 079bbbc..b122426 100644 --- a/modules/gui/hyprland.nix +++ b/modules/gui/hyprland.nix @@ -23,7 +23,7 @@ in { enable = mkEnableOption "enable hiper ląd"; }; - imports = [ inputs.hyprland.nixosModules.default ]; + disabledModules = [ "programs/hyprland.nix" ]; config = mkIf cfg.enable { nix.settings = { @@ -35,6 +35,7 @@ in { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk + inputs.xdg-desktop-portal-hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; }; @@ -282,7 +283,7 @@ in { exec-once=[workspace special:rog silent;tile] ${pkgs.asusctl}/bin/rog-control-center exec-once=[workspace special:keepassxc silent;tile] ${pkgs.keepassxc}/bin/keepassxc - ${if config.myOptions.programs.foot.server then "exec-once=sleep 0.5 && ${pkgs.systemd}/bin/systemctl --user start foot.service" else ""} + ${if config.myOptions.programs.foot.server then "exec-once=sleep 0.5 && ${pkgs.systemd}/bin/systemctl --user restart foot.service" else ""} exec-once=${hyprland}/bin/hyprctl setcursor Bibata-Modern-Classic 24 #exec-once=${wl-clipboard}/bin/wl-paste --watch cliphist store