From 2006a2058f80be0ee1c8520ff72943877e449dab Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Sun, 16 Jul 2023 16:40:40 +0200 Subject: [PATCH] fixed a stupid bug with chmura and attempted adding a hyprland plugin myself --- homes/chmura/default.nix | 1 - homes/default.nix | 2 +- homes/jacek/default.nix | 1 + homes/jacek/gui/hypr/default.nix | 1 + .../gui/hypr/split-monitor-workspaces.nix | 24 +++++++++++++++++++ homes/jacek/gui/waybar/default.nix | 2 +- 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 homes/jacek/gui/hypr/split-monitor-workspaces.nix diff --git a/homes/chmura/default.nix b/homes/chmura/default.nix index ac95f2a..4814a9d 100644 --- a/homes/chmura/default.nix +++ b/homes/chmura/default.nix @@ -16,7 +16,6 @@ home = { username = "chmura"; - #homeDirectory = "/home/chmura"; packages = with pkgs; [ git exa diff --git a/homes/default.nix b/homes/default.nix index eff22c6..dc566c3 100644 --- a/homes/default.nix +++ b/homes/default.nix @@ -9,7 +9,7 @@ extraSpecialArgs = {inherit inputs self;}; # let home-manager access inputs and self users = { jacek = import ./jacek; - chmura = import ./chmura; + #chmura = import ./chmura; }; }; } diff --git a/homes/jacek/default.nix b/homes/jacek/default.nix index 02ad431..b903f5a 100644 --- a/homes/jacek/default.nix +++ b/homes/jacek/default.nix @@ -90,6 +90,7 @@ waypipe swaylock trash-cli + bibata-cursors ]; stateVersion = lib.mkDefault "23.11"; diff --git a/homes/jacek/gui/hypr/default.nix b/homes/jacek/gui/hypr/default.nix index d12ec7d..6f1dff3 100644 --- a/homes/jacek/gui/hypr/default.nix +++ b/homes/jacek/gui/hypr/default.nix @@ -9,6 +9,7 @@ enable = true; plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix + pkgs.callPackage ./split-monitor-workspaces {inherit (pkgs.hyprland.packages.${pkgs.system}) hyprland;} ]; extraConfig = '' #laptop diff --git a/homes/jacek/gui/hypr/split-monitor-workspaces.nix b/homes/jacek/gui/hypr/split-monitor-workspaces.nix new file mode 100644 index 0000000..25f16a3 --- /dev/null +++ b/homes/jacek/gui/hypr/split-monitor-workspaces.nix @@ -0,0 +1,24 @@ +{ + lib, + stdenv, + hyprland, +}: stdenv.mkDerivation { + pname = "split-monitor-workspaces"; + src = lib.fetchFromGithub { + owner = "Duckonaut"; + repo = "split-monitor-workspaces"; + rev = "07696f7f8d2681c3c9d4d0d2f99c679cb941e8e7"; + sha256 = ""; + }; + + inherit (hyprland) nativeBuildInputs; + + buildInputs = [hyprland] ++ hyprland.buildInputs; + + meta = with lib; { + homepage = "https://github.com/Duckonaut/split-monitor-workspaces"; + description = "A small Hyprland plugin to provide awesome-like workspace behavior"; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/homes/jacek/gui/waybar/default.nix b/homes/jacek/gui/waybar/default.nix index c20c77f..43f1298 100644 --- a/homes/jacek/gui/waybar/default.nix +++ b/homes/jacek/gui/waybar/default.nix @@ -12,7 +12,7 @@ settings.mainBar = { gtk-layer-shell = true; layer = "top"; - modules-left = [ "custom/launcher" "custom/power_profile" "custom/xwayland" "tray" "hyprland/workspaces" ]; + modules-left = [ "custom/launcher" "custom/xwayland" "tray" "hyprland/workspaces" ]; modules-center = [ "hyprland/window" ]; modules-right = [ "custom/dnd" "backlight" "cava" "pulseaudio" "clock" "battery" "custom/power" ];