Update, a2dp, cursor, gpg pinentry

This commit is contained in:
Alexander Bantyev 2021-05-10 03:04:18 +03:00
parent 6052883ac5
commit 52cbcb19a3
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
10 changed files with 83 additions and 34 deletions

View File

@ -154,11 +154,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1618789951, "lastModified": 1620423550,
"narHash": "sha256-EoQxcVIiaqjUwwTl1YF3zGnXtzEvOUDL3SBZ8ASELvU=", "narHash": "sha256-sCUnGE28hagq2nVvypGqxMRz7AiW7ewEQ8j7WTlpm7c=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "6aa6556bcab6dc0f6398b4daa8404d788fd7a6a2", "rev": "b2dec35b86e8488831734ff7936589d710b47420",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,6 +185,23 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1617481909,
"narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"ref": "VERSION_0_8_4",
"repo": "lowdown",
"type": "github"
}
},
"materia-theme": { "materia-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -224,14 +241,15 @@
}, },
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1618857497, "lastModified": 1620308124,
"narHash": "sha256-N/Nnil1kwtTkagWfjOeBWgzFzK1UwkjQoWcRj/Q+Jqk=", "narHash": "sha256-pqh8K3QXin8xSVT3asHCXiTeWFcI3qDBbCLiB1JcHtU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "3cbad4b035939b99683265118d4f01c4b21a7a19", "rev": "db6ab75caec3ea4f575d7a01a28fd1fd7bc28892",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +340,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1618864275, "lastModified": 1620425984,
"narHash": "sha256-LreKCrt7mwqmS++ved5RXlVAzo2iZ1Xajeq+g+xuSOw=", "narHash": "sha256-RwHSY3jyQ6YAOTjeppfIBcfR+Y/0GNwKOIP3N9MTYQI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f4d89f28d78102add4f615783618dd5a437bf6fe", "rev": "d807301cceaad1073eb9d5175df270e034269018",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +385,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1618801528, "lastModified": 1620340338,
"narHash": "sha256-1ru9LzP33ElEAZcDzYLgJQG3/uHhAg0LFJEfVZSOPZg=", "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0a5f5bab0e08e968ef25cff393312aa51a3512cf", "rev": "63586475587d7e0e078291ad4b49b6f6a6885100",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -459,11 +477,11 @@
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1618765124, "lastModified": 1619850087,
"narHash": "sha256-udEewuJurLwhQR6+16rISPML4N5fTWT5INZpr8x/Sww=", "narHash": "sha256-UVVge/7R/4afO+hp+T6MOiZJjMH8LS3VNXEWiRIRPcA=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "f4c8d4b298cdf4364ca1f31668c686e1774d7ab3", "rev": "8b287056215cac91438a671054e7eb2c932ab21a",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

View File

@ -28,5 +28,27 @@ with deviceSpecific; {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
pulse.enable = true; pulse.enable = true;
media-session.config.bluez-monitor = {
properties = { };
rules = [
{
actions = {
update-props = {
"bluez5.auto-connect" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
"bluez5.hw-volume" =
[ "hfp_ag" "hsp_ag" "a2dp_source" "a2dp_sink" ];
};
};
matches = [{ "device.name" = "~bluez_card.*"; }];
}
{
actions = { update-props = { "node.pause-on-idle" = false; }; };
matches = [
{ "node.name" = "~bluez_input.*"; }
{ "node.name" = "~bluez_output.*"; }
];
}
];
};
}; };
} }

View File

@ -13,5 +13,9 @@
home.file.".icons/default".source = home.file.".icons/default".source =
"${pkgs.breeze-qt5}/share/icons/breeze_cursors"; "${pkgs.breeze-qt5}/share/icons/breeze_cursors";
home.file.".icons/Breeze".source =
"${pkgs.breeze-qt5}/share/icons/breeze_cursors";
}; };
} }

View File

@ -61,6 +61,10 @@
thumbnail-limit = 10; thumbnail-limit = 10;
}; };
"org/gnome/desktop/interface" = {
cursor-theme = "default";
};
"org/gnome/evince/default" = { "org/gnome/evince/default" = {
inverted-colors = true; inverted-colors = true;
}; };

View File

@ -1,11 +1,13 @@
{ pkgs, ... }: { { pkgs, config, ... }: {
services.dbus.packages = [ pkgs.gcr ];
home-manager.users.balsoft = { home-manager.users.balsoft = {
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryFlavor = "gnome3"; pinentryFlavor = "gtk2";
};
programs.gpg = {
enable = true;
homedir = "${config.home-manager.users.balsoft.xdg.dataHome}/gnupg";
}; };
programs.gpg.enable = true;
}; };
} }

View File

@ -67,9 +67,6 @@ in {
"sftp://balsoft.ru/home/balsoft balsoft.ru" "sftp://balsoft.ru/home/balsoft balsoft.ru"
] ++ map (machine: "sftp://${machine}/home/balsoft ${machine}") ] ++ map (machine: "sftp://${machine}/home/balsoft ${machine}")
(builtins.attrNames inputs.self.nixosConfigurations); (builtins.attrNames inputs.self.nixosConfigurations);
extraConfig = {
gtk-cursor-theme-name = "Breeze";
};
}; };
}; };

View File

@ -36,7 +36,11 @@ in {
bindingMode = default // { text = thm.yellow; }; bindingMode = default // { text = thm.yellow; };
}; };
statusCommand = "${pkgs.i3blocks}/bin/i3blocks"; statusCommand = "${pkgs.i3blocks}/bin/i3blocks";
fonts = [ "IBM Plex Mono 11" "Material Icons 11" "Roboto Mono 11" ]; fonts = {
names = [ "IBM Plex Sans" "Material Icons" "Roboto Mono" ];
style = "Regular";
size = 12.0;
};
mode = "hide"; mode = "hide";
position = "bottom"; position = "bottom";
workspaceNumbers = false; workspaceNumbers = false;
@ -50,10 +54,10 @@ in {
in '' in ''
interval=60 interval=60
markup=pango markup=pango
'' + genIniOrdered ( '' + genIniOrdered ([ (scr "email") ]
[ (scr "email") ]
++ [ (scrint "weather" 600) (scr "emacs") (scr "nixos") ] ++ [ (scrint "weather" 600) (scr "emacs") (scr "nixos") ]
++ [ (scrint "youtrack-wage" 3600) (scrint "music" 3) (scrint "sound" 1) ] ++ [ ++ [ (scrint "youtrack-wage" 3600) (scrint "music" 3) (scrint "sound" 1) ]
++ [
(scrint "cpu" 5) (scrint "cpu" 5)
(scrint "freq" 10) (scrint "freq" 10)
(scr "temperature") (scr "temperature")

View File

@ -23,7 +23,6 @@
}; };
systemd.user.startServices = true; systemd.user.startServices = true;
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.enableNixDirenvIntegration = true; programs.direnv.enableNixDirenvIntegration = true;
}; };

View File

@ -12,12 +12,7 @@
services.udev.packages = [ pkgs.yubikey-personalization ]; services.udev.packages = [ pkgs.yubikey-personalization ];
home-manager.users.balsoft.home.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh"; # home-manager.users.balsoft.home.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh";
environment.shellInit = ''
export GPG_TTY="$(tty)"
gpg-connect-agent /bye
'';
home-manager.users.balsoft.home.file.".gnupg/scdaemon.conf".text = "reader-port Yubico Yubi"; home-manager.users.balsoft.home.file.".gnupg/scdaemon.conf".text = "reader-port Yubico Yubi";

View File

@ -40,7 +40,11 @@ in {
]; ];
"" = [{ app_id = "cantata"; }]; "" = [{ app_id = "cantata"; }];
}; };
fonts = [ "IBM Plex 9" ]; fonts = {
names = [ "IBM Plex" ];
style = "Regular";
size = 9.0;
};
colors = rec { colors = rec {
background = thm.bg; background = thm.bg;