From 43ec8d68ce3d8cbc90ea51b8262651914ba6efa0 Mon Sep 17 00:00:00 2001 From: zackartz Date: Mon, 18 Mar 2024 11:24:20 -0400 Subject: [PATCH] 206 current 2024-03-18 11:24:09 24.05.20240316.c75037b 6.8.0-zen1 * --- env/wayland/default.nix | 7 ++++--- flake.lock | 36 ++++++++++++++++---------------- modules/home-manager/default.nix | 3 ++- modules/rice/sway/default.nix | 9 ++++++++ 4 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 modules/rice/sway/default.nix diff --git a/env/wayland/default.nix b/env/wayland/default.nix index b5411fa..94e8d83 100644 --- a/env/wayland/default.nix +++ b/env/wayland/default.nix @@ -6,7 +6,7 @@ imports = [./fonts.nix]; environment.etc."greetd/environments".text = '' - Hyprland + sway ''; services = { @@ -14,7 +14,7 @@ enable = true; settings = rec { initial_session = { - command = "Hyprland"; + command = "sway"; user = "zack"; }; default_session = initial_session; @@ -58,9 +58,10 @@ xdg.portal = { enable = true; config.common.default = "*"; + wlr.enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-hyprland + # pkgs.xdg-desktop-portal-hyprland ]; }; diff --git a/flake.lock b/flake.lock index e9bec01..f705c0b 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1710506163, - "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710281778, - "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "49a266d2ca59df8a03249550e73a54626181b65d", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710519433, - "narHash": "sha256-KODRuf2tf2SueqCEcj6Pu5cpBy8WcXsM0DkEeR5noBk=", + "lastModified": 1710735304, + "narHash": "sha256-U8JPTqW1CG3q7gQheidY5w/D7V6oNmwbyNkoVE7tiCM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a958884b5259ec5d6a2c97078b373c722ae20c39", + "rev": "7587cadd0a4e94c9ba42c00307854052798cf9b2", "type": "github" }, "original": { @@ -396,11 +396,11 @@ ] }, "locked": { - "lastModified": 1710281379, - "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -427,11 +427,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -454,11 +454,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710491356, - "narHash": "sha256-DeMiM/lgf8HqeAcDU26EeMaoU0phB8mY2RVYBtpvZN0=", + "lastModified": 1710764166, + "narHash": "sha256-sn9+jsAxmSTKX5C31xTDqwGc+IAlz4Q5n+eVE+MRrZk=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f7c78852f37126244b43e71e5158cdc3d70ad0a", + "rev": "f876a0a2e9abc8945e312e6587b1f78d466de184", "type": "github" }, "original": { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index be57680..2aa380b 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -14,7 +14,8 @@ ./swayidle.nix - ../rice/hyprland + # ../rice/hyprland + ../rice/sway ../rice/gtk.nix ../rice/kitty.nix ../rice/waybar diff --git a/modules/rice/sway/default.nix b/modules/rice/sway/default.nix new file mode 100644 index 0000000..08bfa73 --- /dev/null +++ b/modules/rice/sway/default.nix @@ -0,0 +1,9 @@ +{...}: { + wayland.windowManager.sway = { + enable = true; + config = rec { + terminal = "kitty"; + startup = [{command = "firefox";}]; + }; + }; +}