Merge curacao and cranberry work
This commit is contained in:
commit
768b38b87f
|
@ -190,6 +190,7 @@
|
||||||
usbutils
|
usbutils
|
||||||
dmidecode
|
dmidecode
|
||||||
lshw
|
lshw
|
||||||
|
labelle # Label printer
|
||||||
|
|
||||||
# Locker
|
# Locker
|
||||||
(pkgs.writeShellApplication {
|
(pkgs.writeShellApplication {
|
||||||
|
|
|
@ -74,7 +74,10 @@ in
|
||||||
jujutsu = {
|
jujutsu = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
git.auto-local-bookmark = true;
|
git = {
|
||||||
|
auto-local-bookmark = true;
|
||||||
|
auto-local-branch = true;
|
||||||
|
};
|
||||||
user = {
|
user = {
|
||||||
email = cfg.userEmail;
|
email = cfg.userEmail;
|
||||||
name = cfg.userName;
|
name = cfg.userName;
|
||||||
|
|
|
@ -76,6 +76,11 @@
|
||||||
# on others I sometimes turn it off when unsuspending.
|
# on others I sometimes turn it off when unsuspending.
|
||||||
logind.extraConfig = "HandlePowerKey=ignore";
|
logind.extraConfig = "HandlePowerKey=ignore";
|
||||||
|
|
||||||
|
udev.extraRules = ''
|
||||||
|
# DYMO LabelPOINT 350
|
||||||
|
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="0922", ATTRS{idProduct}=="0015", MODE="0666"
|
||||||
|
'';
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO Hibernation?
|
# TODO Hibernation?
|
||||||
|
|
Loading…
Reference in a new issue