thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch to different hyprland split plugin

This commit is contained in:
Thomas Avé 2024-10-23 14:07:26 +02:00
parent 64bc5a2ca1
commit a3df23e8e2
4 changed files with 60 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
flake.lock
View File

@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728902391, "lastModified": 1729527199,
"narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "9874e08eec85b5542ca22494e127b0cdce46b786", "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729174520, "lastModified": 1729551526,
"narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,11 +193,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1729195555, "lastModified": 1729657195,
"narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=", "narHash": "sha256-Dvz+t4NJFjQZLBwgehzauDsPTGAijWIjr5eS3TRRGmU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f", "rev": "6e0aadc585c6d9fdaaebfa5853adbf9610897c82",
"revCount": 5352, "revCount": 5368,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -262,6 +262,26 @@
"type": "github" "type": "github"
} }
}, },
"hyprsplit": {
"inputs": {
"hyprland": [
"hyprland"
]
},
"locked": {
"lastModified": 1729448215,
"narHash": "sha256-ZLyhwjuvitojHYpogNcf4yFgU2Zf6eZUIvt8/tsZmZY=",
"ref": "refs/heads/main",
"rev": "73452b8a1deb5c260373f68ba1daba3a426da380",
"revCount": 47,
"type": "git",
"url": "https://github.com/shezdy/hyprsplit"
},
"original": {
"type": "git",
"url": "https://github.com/shezdy/hyprsplit"
}
},
"hyprutils": { "hyprutils": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -312,21 +332,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1693833173,
"narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1725634671,
@ -377,11 +382,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729413321,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +398,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729413321,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,11 +414,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1729241235, "lastModified": 1729683741,
"narHash": "sha256-4xH8KlxxfrWov0rp1PUvlsawQg92nrwuqVlbkZciyFU=", "narHash": "sha256-IvsiJRTO5+BUAN3+jkWnZZ1h6LbgguHgtTgHGJia2VM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "a17eb2fba1c65b9508a494375953f62ff9dd6ee1", "rev": "b79837253f7eb49c14d8665b656202ef0d78845a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +438,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1728778939, "lastModified": 1729104314,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -452,31 +457,9 @@
"fzgo": "fzgo", "fzgo": "fzgo",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprsplit": "hyprsplit",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nur": "nur", "nur": "nur"
"split-monitor-workspaces": "split-monitor-workspaces"
}
},
"split-monitor-workspaces": {
"inputs": {
"hyprland": [
"hyprland"
],
"nix-filter": "nix-filter"
},
"locked": {
"lastModified": 1718315792,
"narHash": "sha256-ArK3uk6WuujCC0zz7Hfv4DRY8hz6fLEhECE50JouHMI=",
"ref": "fix/hyprutils",
"rev": "6a77ffc86fb4b6051e9fa8f935edff4be2329716",
"revCount": 82,
"type": "git",
"url": "https://github.com/Duckonaut/split-monitor-workspaces"
},
"original": {
"ref": "fix/hyprutils",
"type": "git",
"url": "https://github.com/Duckonaut/split-monitor-workspaces"
} }
}, },
"systems": { "systems": {

25
flake.nix
View File

@ -10,11 +10,16 @@
url = "https://github.com/hyprwm/Hyprland"; url = "https://github.com/hyprwm/Hyprland";
submodules = true; submodules = true;
}; };
split-monitor-workspaces = { # split-monitor-workspaces = {
# type = "git";
# url = "https://github.com/Duckonaut/split-monitor-workspaces";
# inputs.hyprland.follows = "hyprland";
# ref = "fix/hyprutils";
# };
hyprsplit = {
type = "git"; type = "git";
url = "https://github.com/Duckonaut/split-monitor-workspaces"; url = "https://github.com/shezdy/hyprsplit";
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
ref = "fix/hyprutils";
}; };
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
ags.url = "github:Aylur/ags"; ags.url = "github:Aylur/ags";
@ -27,19 +32,9 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
commonModules = host: user: [ commonModules = host: user: [
./hosts/${host}/hardware-configuration.nix ./hosts/${host}/hardware-configuration.nix
{ nixpkgs.overlays = [ # see https://nixpk.gs/pr-tracker.html?pr=348887 { nixpkgs.overlays = [
nur.overlay nur.overlay
(final: prev: { (self: super: { utillinux = super.util-linux; })
cliphist = prev.cliphist.overrideAttrs (_old: {
src = final.fetchFromGitHub {
owner = "sentriz";
repo = "cliphist";
rev = "c49dcd26168f704324d90d23b9381f39c30572bd";
sha256 = "sha256-2mn55DeF8Yxq5jwQAjAcvZAwAg+pZ4BkEitP6S2N0HY=";
};
vendorHash = "sha256-M5n7/QWQ5POWE4hSCMa0+GOVhEDCOILYqkSYIGoy/l0=";
});
})
]; } ]; }
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

7
home/hyprland/default.nix
View File

@ -19,8 +19,11 @@ let
echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy; echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy;
''; '';
workspace_command_prefix = "split-"; # workspace_command_prefix = "split-";
hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ]; # hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ];
workspace_command_prefix = "split:";
hyprland_plugins = [ inputs.hyprsplit.packages."${pkgs.system}".hyprsplit ];
# Disable split-monitor-workspaces # Disable split-monitor-workspaces
# workspace_command_prefix = ""; # workspace_command_prefix = "";

2
hosts/Common/default.nix
View File

@ -31,7 +31,7 @@
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
iosevka iosevka
roboto roboto