Skip to content

Commit

Permalink
update to 24.05
Browse files Browse the repository at this point in the history
  • Loading branch information
kmein committed Jun 3, 2024
1 parent b8bf6b2 commit 87e1018
Show file tree
Hide file tree
Showing 21 changed files with 232 additions and 120 deletions.
2 changes: 1 addition & 1 deletion configs/alacritty.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ in {
programs.alacritty = {
enable = true;
settings = {
key_bindings = [
keyboard.bindings = [
{
key = "Plus";
mods = "Control";
Expand Down
31 changes: 15 additions & 16 deletions configs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,10 @@ in {
pkgs.capitaine-cursors
];

home-manager.users.me = {
home.pointerCursor = {
name = "capitaine-cursors-white";
package = pkgs.capitaine-cursors;
size = 12;
};
stylix.cursor = {
name = "capitaine-cursors-white";
package = pkgs.capitaine-cursors;
size = 12;
};
}
{
Expand Down Expand Up @@ -121,19 +119,19 @@ in {
};
}
{
services.displayManager = {
autoLogin = {
enable = true;
user = config.users.users.me.name;
};
};
services.xserver = {
enable = true;
displayManager = {
autoLogin = {
enable = true;
user = config.users.users.me.name;
};
lightdm = {
displayManager.lightdm = {
enable = true;
greeters.gtk = {
enable = true;
greeters.gtk = {
enable = true;
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
};
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
};
};
};
Expand Down Expand Up @@ -189,6 +187,7 @@ in {
}
{
home-manager.users.me.home.stateVersion = "22.05";
home-manager.backupFileExtension = "bak";
}
{
systemd.user.services.udiskie = {
Expand Down
2 changes: 1 addition & 1 deletion configs/i3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ in {

environment.systemPackages = [dashboard];

services.displayManager.defaultSession = "none+i3";
services.xserver = {
displayManager.defaultSession = "none+i3";
windowManager.i3 = {
enable = true;
package = pkgs.i3-gaps;
Expand Down
11 changes: 6 additions & 5 deletions configs/keyboard.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@
};
defaultLanguage = "de";
in {
services.libinput.enable = true;

# man 7 xkeyboard-config
services.xserver = {
exportConfiguration = true; # link /usr/share/X11 properly
layout = "de";
xkb.layout = "de";
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
# buckwalter: http://www.qamus.org/transliteration.htm
xkbVariant = "T3";
xkbOptions = commaSep xkbOptions;
libinput.enable = true;
xkbDir = pkgs.symlinkJoin {
xkb.variant = "T3";
xkb.options = commaSep xkbOptions;
xkb.dir = pkgs.symlinkJoin {
name = "x-keyboard-directory";
paths = [
"${pkgs.xkeyboard_config}/etc/X11/xkb"
Expand Down
2 changes: 1 addition & 1 deletion configs/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ in {
niveumPackages.menu-calc
nix-prefetch-git
niveumPackages.nix-git
nixfmt
nixfmt-rfc-style
par
qrencode

Expand Down
2 changes: 1 addition & 1 deletion configs/printing.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ in {
];

# allow connecting to .local printers
services.avahi.nssmdns = true;
services.avahi.nssmdns4 = true;

hardware.printers.ensurePrinters = [
{
Expand Down
8 changes: 0 additions & 8 deletions configs/sound.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@
publish.userServices = true;
};

environment.etc."pipewire/pipewire-pulse.conf.d/50-network-party.conf".text = ''
context.exec = [
{ path = "pactl" args = "load-module module-native-protocol-tcp" }
{ path = "pactl" args = "load-module module-zeroconf-discover" }
{ path = "pactl" args = "load-module module-zeroconf-publish" }
]
'';

environment.systemPackages = [
pkgs.pavucontrol
pkgs.ncpamixer
Expand Down
Loading

0 comments on commit 87e1018

Please sign in to comment.