From b2d397a7157f94da1f2dce98d47dea0a68b695f3 Mon Sep 17 00:00:00 2001 From: zackartz Date: Thu, 27 Jun 2024 11:49:31 -0400 Subject: [PATCH] 783 current 2024-06-27 11:49:27 24.11.20240627.3664857 6.9.6-zen1 * --- flake.lock | 56 ++++++++++----------- homes/x86_64-linux/zack@earth/default.nix | 2 +- modules/home/wms/river/default.nix | 26 ++++++++++ modules/home/wms/sway/default.nix | 45 +++++++++++++++++ modules/nixos/protocols/wayland/default.nix | 2 +- 5 files changed, 101 insertions(+), 30 deletions(-) create mode 100644 modules/home/wms/river/default.nix diff --git a/flake.lock b/flake.lock index aad0864..9d6cf9d 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719426468, - "narHash": "sha256-HlEAH79OHAUl/ENo40j83Vb9Q8vEh+gi50TOMCgJqdA=", + "lastModified": 1719457243, + "narHash": "sha256-5rOWwMAp/suWVKGavhfdyLsF2mA7Fv2DQWXlt7S+QWA=", "owner": "catppuccin", "repo": "nix", - "rev": "51bd4ccfcfcc8e65a4fcb721a3e9c68afe009401", + "rev": "53967ef237edd38a5b5cc5441e9b6a44b9554977", "type": "github" }, "original": { @@ -561,11 +561,11 @@ ] }, "locked": { - "lastModified": 1719418488, - "narHash": "sha256-Hu75KIbGLJA8qe42rO5WkRQ+E+BuzjS42bNEZcy9zT8=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "607f969f5dca2dc100cbc53e24ab49ac24ef8987", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719350558, - "narHash": "sha256-oACeKBS762XSJbN/rz5Y2xPYGzWQHhwDqn+CeODuWsM=", + "lastModified": 1719493676, + "narHash": "sha256-EClgfHBU8jLOQxRrkmEgkHHL22nrvNkPjhABtsOEscE=", "ref": "refs/heads/main", - "rev": "e4d09aa3a9de9a9e71c10bf4b6800585b3db9a4c", - "revCount": 4891, + "rev": "f2dc48d92f340efe6d4264b92d38378c18a3e1ea", + "revCount": 4892, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -842,11 +842,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719410911, - "narHash": "sha256-jnL8LSx1wJvJTBBRwjaggFUzc9q0/KXbvPmP3tyeyag=", + "lastModified": 1719467057, + "narHash": "sha256-8gQ0txwuLoBpBeIhTAkl+/7Hi/AD4KE5m4YhOn1OA3E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "86c00892c3ae4869eb99b677b48ee111409a93f1", + "rev": "bb6bea003dc464a4248a173e71a007d368691092", "type": "github" }, "original": { @@ -858,11 +858,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719349695, - "narHash": "sha256-rnBC/8Y0CECztfoMKBxxo4hzd4TBu1bu9CnwpWDaB1U=", + "lastModified": 1719414226, + "narHash": "sha256-h/qJ+1R+BtY+mX02UsqYW82hEl78mrHTGAs9yjpFEzU=", "owner": "neovim", "repo": "neovim", - "rev": "9dc09a4cdde9fad4e7861b9467276260bd9b82a9", + "rev": "fc9b70826ec88ca2e6c0624c522b872e87aa7ac1", "type": "github" }, "original": { @@ -873,11 +873,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719103869, + "narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863", "type": "github" }, "original": { @@ -894,11 +894,11 @@ ] }, "locked": { - "lastModified": 1718025593, - "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", + "lastModified": 1719450236, + "narHash": "sha256-fh0l6pLvuTrTBakFMQfK7lwpjvWd5i+CFyVs8TMzPNo=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", + "rev": "1867f28f87fcf4e817f165003aff967a5280aaab", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1719285171, - "narHash": "sha256-kOUKtKfYEh8h8goL/P6lKF4Jb0sXnEkFyEganzdTGvo=", + "lastModified": 1719379843, + "narHash": "sha256-u+D+IOAMMl70+CJ9NKB+RMrASjInuIWMHzjLWQjPZ6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfb89a95f19bea461fc37228dc4d07b22fe617c2", + "rev": "b3f3c1b13fb08f3828442ee86630362e81136bbc", "type": "github" }, "original": { @@ -1033,11 +1033,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1719370826, - "narHash": "sha256-Zu/zdSWXufEQ4JvizNZKC/SzUX9ZOEaqMVyZ/bBul6c=", + "lastModified": 1719451888, + "narHash": "sha256-Ky0sgEEJMcBmNEJztY6KcVn+6bq74EKM7pd1CR1wnPQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e10b0f95bd07422c63a88cfa50ccccebd4963b99", + "rev": "3664857c48feacb35770c00abfdc671e55849be5", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/zack@earth/default.nix b/homes/x86_64-linux/zack@earth/default.nix index 4d6d565..476fe15 100644 --- a/homes/x86_64-linux/zack@earth/default.nix +++ b/homes/x86_64-linux/zack@earth/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - wms.sway.enable = true; + wms.river.enable = true; apps = { web.firefox.enable = true; diff --git a/modules/home/wms/river/default.nix b/modules/home/wms/river/default.nix new file mode 100644 index 0000000..1b1378b --- /dev/null +++ b/modules/home/wms/river/default.nix @@ -0,0 +1,26 @@ +{ + lib, + config, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.wms.river; +in { + options.wms.river = with types; { + enable = mkBoolOpt false "Enable River WM"; + }; + + config = mkIf cfg.enable { + wayland.windowManager.river = { + enable = true; + settings = { + spawn = [ + "firefox" + "kitty" + ]; + }; + }; + }; +} diff --git a/modules/home/wms/sway/default.nix b/modules/home/wms/sway/default.nix index 9bf5c1e..2f22c2b 100644 --- a/modules/home/wms/sway/default.nix +++ b/modules/home/wms/sway/default.nix @@ -7,6 +7,12 @@ with lib; with lib.custom; let cfg = config.wms.sway; + + mkService = recursiveUpdate { + Unit.PartOf = ["graphical-session.target"]; + Unit.After = ["graphical-session.target"]; + Install.WantedBy = ["graphical-session.target"]; + }; in { options.wms.sway = with types; { enable = mkBoolOpt false "Enable Sway"; @@ -16,7 +22,46 @@ in { wayland.windowManager.sway = { enable = true; xwayland = true; + package = pkgs.swayfx; extraOptions = ["--unsupported-gpu"]; + + config = { + terminal = "kitty"; + startup = [{command = "firefox";}]; + + menu = "killall anyrun || anyrun"; + + input = { + "Logitech USB Receiver Keyboard" = { + accel_profile = "flat"; + pointer_accel = "0"; + }; + "Logitech USB Receiver" = { + accel_profile = "flat"; + pointer_accel = "0"; + }; + }; + + output = { + DP-1 = { + mode = "2560x1440@240Hz"; + adaptive_sync = "off"; + }; + HDMI-A-1 = { + disable = "disable"; + }; + }; + }; + }; + + systemd.user.services = { + swaybg = mkService { + Unit.Description = "Wallpaper Chooser"; + Service = { + ExecStart = "${getExe pkgs.swaybg} -i ${wallpaper}"; + Restart = "always"; + }; + }; }; }; } diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index 3c604a5..0374d54 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -26,7 +26,7 @@ in { enable = true; settings = rec { initial_session = { - command = "sway"; + command = "river"; user = "zack"; }; default_session = initial_session;