atagen/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge conflict

Browse source
This commit is contained in:
atagen 2024-01-12 15:29:18 +11:00
commit f38179097b
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/programs/wlogout.nix
View file

@ -29,7 +29,7 @@ in {
normal.black
(builtins.path {
name = "winlogo";
path = ./winlogo.png;
path = ../winlogo.png;
sha256 = "7c1ff96b553c7a7ca3a7b7cf8efe830ab7feea92355aed288a10ee7347c24108";
})
]

38
system/adrift.nix
View file

@ -31,12 +31,12 @@
};
fileSystems."/" = {
device = "thing goes here";
device = "/dev/disk/by-uuid/26389642-cf51-4c58-98e9-1fe491a11bb9";
fsType = "ext4";
};
swapDevices = [
"update this"
{device = "/dev/disk/by-uuid/a732641d-1233-45a7-8614-53caed60f11b";}
];
boot.loader.systemd-boot.configurationLimit = 2;
@ -66,23 +66,23 @@
services.xserver.videoDrivers = ["i915"];
programs.xwayland.enable = true;
# xdg.portal = {
# enable = true;
# wlr = {
# enable = true;
# # settings = {
# # screencast = {
# # output_name = "DP-1";
# # max_fps = 60;
# # chooser_type = "simple";
# # chooser_nvidia = "${pkgs.slurp}/bin/slurp -f %o -or";
# # };
# # };
# };
# extraPortals = with pkgs; [
# xdg-desktop-portal-gtk
# ];
# };
xdg.portal = {
enable = true;
wlr = {
enable = true;
# # settings = {
# # screencast = {
# # output_name = "DP-1";
# # max_fps = 60;
# # chooser_type = "simple";
# # chooser_nvidia = "${pkgs.slurp}/bin/slurp -f %o -or";
# # };
# # };
};
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
];
};
environment.systemPackages = with pkgs; [
wl-clipboard