mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2024-11-15 05:13:10 +01:00
thinkpad: wayland and bluetooth fixes
This commit is contained in:
parent
758c58f5c2
commit
6cb6667093
|
@ -66,7 +66,14 @@
|
||||||
fwupd.enable = true; # firmware updates
|
fwupd.enable = true; # firmware updates
|
||||||
zfs.autoScrub.enable = true;
|
zfs.autoScrub.enable = true;
|
||||||
};
|
};
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
General = {
|
||||||
|
Experimental = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services.logind = {
|
services.logind = {
|
||||||
lidSwitch = "suspend-then-hibernate";
|
lidSwitch = "suspend-then-hibernate";
|
||||||
|
|
|
@ -18,15 +18,6 @@ in
|
||||||
pww = callPackage ../pkgs/pww { };
|
pww = callPackage ../pkgs/pww { };
|
||||||
ianny = callPackage ../pkgs/ianny { };
|
ianny = callPackage ../pkgs/ianny { };
|
||||||
|
|
||||||
river = prev.river.overrideAttrs (_: {
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/riverwm/river/pull/735.patch";
|
|
||||||
hash = "sha256-7pwQfXurgJej0NZ+kD2qBQdrqD6pYA1PbHxzG+5rGac=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
||||||
|
|
||||||
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
users.users.rouven = {
|
users.users.rouven = {
|
||||||
description = "Rouven Seifert";
|
description = "Rouven Seifert";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" "wireshark" "etherape" ];
|
extraGroups = [ "wheel" "video" "dialout" "libvirtd" "tss" "input" "wireshark" "etherape" ];
|
||||||
initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
|
initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
|
||||||
};
|
};
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
|
@ -18,11 +18,15 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = [
|
extraPortals = [
|
||||||
pkgs.xdg-desktop-portal-wlr
|
pkgs.xdg-desktop-portal-wlr
|
||||||
|
pkgs.xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
common = {
|
common = {
|
||||||
default = [ "wlr" ];
|
default = [ "wlr" ];
|
||||||
};
|
};
|
||||||
|
"org.freedesktop.impl.portal.FileChooser" = {
|
||||||
|
default = [ "gtk" ];
|
||||||
|
};
|
||||||
"org.freedesktop.impl.portal.Secret" = {
|
"org.freedesktop.impl.portal.Secret" = {
|
||||||
default = [ "gnome-keyring" ];
|
default = [ "gnome-keyring" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
libreoffice
|
libreoffice
|
||||||
mosh
|
mosh
|
||||||
ansible
|
ansible
|
||||||
|
plover.dev
|
||||||
|
|
||||||
# programming languages
|
# programming languages
|
||||||
cargo
|
cargo
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
layer = "top";
|
layer = "top";
|
||||||
position = "top";
|
position = "top";
|
||||||
height = 26;
|
height = 26;
|
||||||
modules-left = [ "river/tags" "custom/spotifytitle" "river/window" ];
|
modules-left = [ "sway/workspaces" "river/tags" "custom/spotifytitle" "river/window" ];
|
||||||
modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
|
modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
|
||||||
network = {
|
network = {
|
||||||
format-wifi = " {essid} ({signalStrength}%)";
|
format-wifi = " {essid} ({signalStrength}%)";
|
||||||
|
@ -24,6 +24,10 @@
|
||||||
format = "{icon}";
|
format = "{icon}";
|
||||||
on-click = "activate";
|
on-click = "activate";
|
||||||
};
|
};
|
||||||
|
"sway/workspaces" = {
|
||||||
|
format = "{icon}";
|
||||||
|
on-click = "activate";
|
||||||
|
};
|
||||||
"river/window" = {
|
"river/window" = {
|
||||||
format = " {}";
|
format = " {}";
|
||||||
# separate-outputs = true;
|
# separate-outputs = true;
|
||||||
|
@ -113,12 +117,14 @@
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#workspaces button,
|
||||||
#tags button {
|
#tags button {
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
color: #${config.colorScheme.colors.base05};
|
color: #${config.colorScheme.colors.base05};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#workspaces button.focused,
|
||||||
#tags button.focused {
|
#tags button.focused {
|
||||||
background-color: #${config.colorScheme.colors.base04};
|
background-color: #${config.colorScheme.colors.base04};
|
||||||
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
|
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
|
||||||
|
@ -128,6 +134,7 @@
|
||||||
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
|
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent,
|
||||||
#tags button.urgent {
|
#tags button.urgent {
|
||||||
background-color: #eb4d4b;
|
background-color: #eb4d4b;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue