poz/niksos
poz/niksos
1
3
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

added chmura to trusted-users and tried patching hyprland and shit

Browse source
This commit is contained in:
jacekpoz 2023-07-17 16:54:42 +02:00
parent a7865169a9
commit a03d3c69e5
5 changed files with 146 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
flake.lock
View file

@ -208,6 +208,28 @@
"type": "github"
}
},
"hyprland-protocols_3": {
"inputs": {
"nixpkgs": [
"split-monitor-workspaces",
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1684265364,
"narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland_2": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
@ -229,6 +251,27 @@
"type": "github"
}
},
"hyprland_3": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_3",
"nixpkgs": "nixpkgs_4",
"wlroots": "wlroots_3",
"xdph": "xdph_3"
},
"locked": {
"lastModified": 1689519965,
"narHash": "sha256-2C9RqRMT4XSsJ9hfGCUyqu8hXCbyhk84F3pEYpm680s=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "b156a9654ff3379b8b40e7b03bb832924ba4665e",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1688500189,
@ -277,13 +320,30 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1688500189,
"narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "78419edadf0fabbe5618643bd850b2f2198ed060",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"conduit": "conduit",
"home-manager": "home-manager",
"hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_3",
"split-monitor-workspaces": "split-monitor-workspaces"
}
},
"rust-analyzer-src": {
@ -330,6 +390,24 @@
"type": "github"
}
},
"split-monitor-workspaces": {
"inputs": {
"hyprland": "hyprland_3"
},
"locked": {
"lastModified": 1689533700,
"narHash": "sha256-DaYa5PlVpnO8QnoAwNHN8UOAKHGzfi43uJRwQ/06vPA=",
"owner": "jacekpoz",
"repo": "split-monitor-workspaces",
"rev": "10ad10b94c3aa1aaa5f08437b40269448f28e965",
"type": "github"
},
"original": {
"owner": "jacekpoz",
"repo": "split-monitor-workspaces",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -381,6 +459,24 @@
"type": "gitlab"
}
},
"wlroots_3": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1686753331,
"narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "7e7633abf09b362d0bad9e3fc650fd692369291d",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
@ -432,6 +528,33 @@
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
},
"xdph_3": {
"inputs": {
"hyprland-protocols": [
"split-monitor-workspaces",
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"split-monitor-workspaces",
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1685385764,
"narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

5
flake.nix
View file

@ -16,7 +16,10 @@
hyprland.url = "github:hyprwm/Hyprland";
hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
split-monitor-workspaces.url = "github:jacekpoz/split-monitor-workspaces";
split-monitor-workspaces = {
url = "github:jacekpoz/split-monitor-workspaces";
inputs.nixpkgs.follows = "hyprland";
};
home-manager = {
url = "github:nix-community/home-manager";

1
homes/jacek/gui/hypr/default.nix
View file

@ -7,6 +7,7 @@
config = {
wayland.windowManager.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland.overrideAttrs (_: _: { patches = [ ./hypr.diff ]; });
plugins = [
inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces

13
homes/jacek/gui/hypr/hypr.diff Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/managers/input/InputMethodRelay.cpp b/src/managers/input/InputMethodRelay.cpp
index 99949fce..7a9d9326 100644
--- a/src/managers/input/InputMethodRelay.cpp
+++ b/src/managers/input/InputMethodRelay.cpp
@@ -88,7 +88,7 @@ void CInputMethodRelay::onNewIME(wlr_input_method_v2* pIME) {
Debug::log(LOG, "IME Destroy");
if (PTI) {
- setPendingSurface(PTI, focusedSurface(PTI));
+ // setPendingSurface(PTI, focusedSurface(PTI));
if (PTI->pWlrInput)
wlr_text_input_v3_send_leave(PTI->pWlrInput);

4
hosts/chmura/configuration.nix
View file

@ -18,6 +18,10 @@
"flakes"
"nix-command"
];
trusted-users = [
"root"
"@wheel"
];
};
programs.zsh.enable = true;