resolve conflict

This commit is contained in:
horhik 2021-06-12 08:18:22 +03:00
commit 4bab073456
1 changed files with 181 additions and 181 deletions

View File

@ -124,12 +124,13 @@
wpa_supplicant python3 xkblayout-state acpi yaru-theme
pipewire pulsemixer nerdfonts
feh compton ninja meson cmake
anki clang_12 llvmPackages_12.libcxxabi
zathura redshift rustup neofetch tree
anki clang_12 zathura redshift rustup neofetch tree
killall audacity thefuck
polkit etcher gsettings-qt appimage-run pamixer unzip qjackctl gnome3.nautilus bluez pkgconfig pavucontrol bpytop
#nur.repos.reedrw.picom-next-ibhagwan
spotify obsidian discord
nfs-utils cifs-utils
nfs-ganesha
];
# Some programs need SUID wrappers, can be configured further or are
@ -221,5 +222,4 @@
sha256 = "0c2p2ycx6c50rzfd5k56cc411cb0ilhc3zyhhxlwcjnz1ysn5laj";
}))
];
}