diff --git a/flake.lock b/flake.lock index 96e8721..6774182 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1726611255, + "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1725201042, - "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { diff --git a/modules/workstation/desktop.nix b/modules/workstation/desktop.nix index 364e8de..1e3f1ea 100644 --- a/modules/workstation/desktop.nix +++ b/modules/workstation/desktop.nix @@ -35,8 +35,7 @@ in xdgOpenUsePortal = true; wlr.enable = true; extraPortals = with pkgs; [ - xdg-desktop-portal-gnome - xdg-desktop-portal-kde + xdg-desktop-portal-gtk ]; }; } diff --git a/modules/workstation/home-manager/desktop/sway/default.nix b/modules/workstation/home-manager/desktop/sway/default.nix index f3c656d..7b8ade5 100644 --- a/modules/workstation/home-manager/desktop/sway/default.nix +++ b/modules/workstation/home-manager/desktop/sway/default.nix @@ -163,6 +163,7 @@ in before-sleep '${pkgs.swaylock}/bin/swaylock -f' ''; } + { command = "exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK"; } { command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; } { command = "${pkgs.keepassxc}/bin/keepassxc"; } { diff --git a/modules/workstation/home-manager/fish.nix b/modules/workstation/home-manager/fish.nix index 1a53069..62822c4 100644 --- a/modules/workstation/home-manager/fish.nix +++ b/modules/workstation/home-manager/fish.nix @@ -9,7 +9,7 @@ let if config.my.desktop.sway.enable then '' if [ -z $DISPLAY ] && [ "$(tty)" = /dev/tty1 ] - exec ${pkgs.sway}/bin/sway + exec dbus-run-session sway end '' else diff --git a/modules/workstation/home-manager/games.nix b/modules/workstation/home-manager/games.nix index 8c8fa74..bc14214 100644 --- a/modules/workstation/home-manager/games.nix +++ b/modules/workstation/home-manager/games.nix @@ -18,5 +18,7 @@ with lib; }; }; - config = mkIf config.my.games.wine.enable { home.packages = with pkgs; [ wine ]; }; + config = mkIf config.my.games.wine.enable { + home.packages = with pkgs; [ wineWowPackages.waylandFull ]; + }; }