pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert some kanshi changes to fix things

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-08-08 10:45:13 +01:00
parent 27d89678de
commit 559126c464
4 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -49,11 +49,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691312444, "lastModified": 1690303752,
"narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "903e06d734bcae48efb79b9afd51b406d2744179", "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1691429655, "lastModified": 1690453540,
"narHash": "sha256-0k4uXBllt7uhiXyXPW+sm3y0aHVN6BVeq5EKouhQsus=", "narHash": "sha256-UDM0gIZcXbooKE+pTL6xAJgHhGIQxSE3XrD8bz8vv3k=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "cebab759d52747c2067217d93096b47281722e57", "rev": "2ea7d10d049e26c9829912da1d16f7f35f5b265d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1691368598, "lastModified": 1690272529,
"narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a8e9243812ba528000995b294292d3b5e120947", "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,18 +167,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1691073628, "lastModified": 1690165843,
"narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=", "narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"type": "gitlab" "type": "gitlab"
} }
}, },

2
home/hyprland/default.nix
View file

@ -36,7 +36,7 @@ in {
services.kanshi = { services.kanshi = {
enable = true; enable = true;
systemdTarget = "hyprland-session.target"; systemdTarget = "hyprland-session.target";
profiles.wallpaper = { profiles.default = {
outputs = [{ criteria = "*"; }]; outputs = [{ criteria = "*"; }];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}"; exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
}; };

13
hosts/Ronin/home.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, shellConfig, ... }: { pkgs, lib, shellConfig, wallpapers, ... }:
let let
username = "elitherl"; username = "elitherl";
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
@ -144,14 +144,15 @@ in {
services.kanshi.profiles = { services.kanshi.profiles = {
undocked = { undocked = {
outputs = [{ outputs = [{
criteria = "AU Optronics 0x1F92"; criteria = "eDP-1";
position = "0,0"; position = "0,0";
}]; }];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
}; };
work = { work = {
outputs = [ outputs = [
{ {
criteria = "AU Optronics 0x1F92"; criteria = "eDP-1";
position = "0,485"; position = "0,485";
} }
{ {
@ -163,6 +164,7 @@ in {
position = "1920,0"; position = "1920,0";
} }
]; ];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
}; };
home = { home = {
outputs = [ outputs = [
@ -171,14 +173,15 @@ in {
position = "0,0"; position = "0,0";
} }
{ {
criteria = "AU Optronics 0x1F92"; criteria = "eDP-1";
position = "1920,0"; position = "1920,0";
} }
]; ];
exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}";
}; };
}; };
xdg.configFile."hypr/display.conf".text = '' xdg.configFile."hypr/display.conf".text = ''
monitor=desc:AU Optronics 0x1F92,preferred,auto,1.25 monitor=desc:eDP-1,preferred,auto,1.25
monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1 monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1
monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1 monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1
monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,auto,1 monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,auto,1

5
hosts/hyprland.nix
View file

@ -30,7 +30,10 @@
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
}; };
programs = { programs = {
hyprland.enable = true; hyprland = {
enable = true;
package = hyprland.packages.${pkgs.system}.hyprland;
};
thunar = { thunar = {
enable = true; enable = true;
plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]; plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];