forked from pub-solar/os
nixos-unstable: fixes for NixOS 24.05
Wireplumber config changes for bluetooth pinentryFlavor -> pinentryPackage alacritty config changed to TOML alacritty deprecated config fixes Nix registry now gets generated from flake inputs -> (nixpkgs.flake.setFlakeRegistry) nssmdns -> nssmdns4
This commit is contained in:
parent
08bd4c519a
commit
b81890d769
|
@ -22,14 +22,15 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
environment.etc."wireplumber/bluetooth.lua.d/51-bluez-config.lua" = {
|
services.pipewire.wireplumber.configPackages = [
|
||||||
text = ''
|
# https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/bluetooth.html
|
||||||
bluez_monitor.properties = {
|
(pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/10-bluez.conf" ''
|
||||||
["bluez5.enable-sbc-xq"] = true,
|
monitor.bluez.properties = {
|
||||||
["bluez5.enable-msbc"] = true,
|
bluez5.enable-hw-volume = true
|
||||||
["bluez5.enable-hw-volume"] = true,
|
bluez5.enable-msbc = true
|
||||||
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
|
bluez5.enable-sbc-xq = true
|
||||||
|
bluez5.headset-roles = [ hsp_hs hsp_ag hfp_hf hfp_ag ]
|
||||||
}
|
}
|
||||||
'';
|
'')
|
||||||
};
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ in {
|
||||||
|
|
||||||
services.gpg-agent = {
|
services.gpg-agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pinentryFlavor = lib.mkDefault "gnome3";
|
pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3;
|
||||||
verbose = true;
|
verbose = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -30,9 +30,6 @@
|
||||||
multiplier = 3;
|
multiplier = 3;
|
||||||
};
|
};
|
||||||
|
|
||||||
# When true, bold text is drawn using the bright variant of colors.
|
|
||||||
draw_bold_text_with_bright_colors = true;
|
|
||||||
|
|
||||||
font = {
|
font = {
|
||||||
# The normal (roman) font face to use.
|
# The normal (roman) font face to use.
|
||||||
normal = {
|
normal = {
|
||||||
|
@ -68,7 +65,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
key_bindings = [
|
keyboard.bindings = [
|
||||||
{
|
{
|
||||||
key = "V";
|
key = "V";
|
||||||
mods = "Control|Super";
|
mods = "Control|Super";
|
||||||
|
@ -172,6 +169,9 @@
|
||||||
# Base16 Burn 256 - alacritty color config
|
# Base16 Burn 256 - alacritty color config
|
||||||
# Benjamin Bädorf
|
# Benjamin Bädorf
|
||||||
colors = {
|
colors = {
|
||||||
|
# When true, bold text is drawn using the bright variant of colors.
|
||||||
|
draw_bold_text_with_bright_colors = true;
|
||||||
|
|
||||||
# Default colors
|
# Default colors
|
||||||
primary = {
|
primary = {
|
||||||
background = "0x1a181a";
|
background = "0x1a181a";
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
yamlFormat = pkgs.formats.yaml {};
|
tomlFormat = pkgs.formats.toml {};
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
WLR_RENDERER =
|
WLR_RENDERER =
|
||||||
if psCfg.graphical.wayland.software-renderer.enable
|
if psCfg.graphical.wayland.software-renderer.enable
|
||||||
|
@ -101,7 +101,7 @@ in {
|
||||||
|
|
||||||
home-manager.users."${psCfg.user.name}" = {
|
home-manager.users."${psCfg.user.name}" = {
|
||||||
home.file."xinitrc".source = ./.xinitrc;
|
home.file."xinitrc".source = ./.xinitrc;
|
||||||
xdg.configFile."alacritty/alacritty.yml".source = yamlFormat.generate "alacritty.yml" (import ./alacritty.nix);
|
xdg.configFile."alacritty/alacritty.toml".source = tomlFormat.generate "alacritty.toml" (import ./alacritty.nix);
|
||||||
xdg.configFile."xmodmap".source = ./.config/xmodmap;
|
xdg.configFile."xmodmap".source = ./.config/xmodmap;
|
||||||
xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs;
|
xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs;
|
||||||
xdg.configFile."user-dirs.locale".source = ./.config/user-dirs.locale;
|
xdg.configFile."user-dirs.locale".source = ./.config/user-dirs.locale;
|
||||||
|
|
|
@ -34,13 +34,6 @@
|
||||||
gc.automatic = true;
|
gc.automatic = true;
|
||||||
optimise.automatic = true;
|
optimise.automatic = true;
|
||||||
|
|
||||||
registry = {
|
|
||||||
nixpkgs.flake = flake.inputs.nixpkgs;
|
|
||||||
unstable.flake = flake.inputs.unstable;
|
|
||||||
master.flake = flake.inputs.master;
|
|
||||||
system.flake = flake.self;
|
|
||||||
};
|
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
# Improve nix store disk usage
|
# Improve nix store disk usage
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
|
|
|
@ -10,7 +10,7 @@ with lib; let
|
||||||
in {
|
in {
|
||||||
services.avahi.enable = true;
|
services.avahi.enable = true;
|
||||||
services.avahi.ipv6 = true;
|
services.avahi.ipv6 = true;
|
||||||
services.avahi.nssmdns = true;
|
services.avahi.nssmdns4 = true;
|
||||||
services.avahi.publish.enable = true;
|
services.avahi.publish.enable = true;
|
||||||
services.avahi.publish.userServices = true;
|
services.avahi.publish.userServices = true;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{config, ...}: {
|
{config, pkgs, ...}: {
|
||||||
pub-solar = {
|
pub-solar = {
|
||||||
# These are your personal settings
|
# These are your personal settings
|
||||||
# The only required settings are `name` and `password`,
|
# The only required settings are `name` and `password`,
|
||||||
|
@ -15,5 +15,5 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home-manager.users.pub-solar.services.gpg-agent.pinentryFlavor = "curses";
|
home-manager.users.pub-solar.services.gpg-agent.pinentryPackage = pkgs.pinentry-curses;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue