Merge branch 'main' into b12f

This commit is contained in:
Benjamin Bädorf 2022-04-30 21:45:23 +02:00
commit 4de8f625fc
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
4 changed files with 9 additions and 11 deletions

View file

@ -30,7 +30,7 @@ in
}; };
home.packages = [ home.packages = [
gnome3.seahorse gnome.seahorse
keepassxc keepassxc
libsecret libsecret
qMasterPassword qMasterPassword

View file

@ -95,10 +95,11 @@ in
flameshot flameshot
libnotify libnotify
gnome3.adwaita-icon-theme gnome.adwaita-icon-theme
gnome.eog gnome.eog
gnome3.nautilus gnome.nautilus
gnome.yelp gnome.yelp
hicolor-icon-theme
wine wine
@ -119,7 +120,7 @@ in
enable = true; enable = true;
font.name = "Lato"; font.name = "Lato";
iconTheme = { iconTheme = {
package = pkgs.papirus-maia-icon-theme; package = pkgs.papirus-icon-theme;
name = "Papirus-Adapta-Nokto-Maia"; name = "Papirus-Adapta-Nokto-Maia";
}; };
theme = { theme = {

View file

@ -17,7 +17,7 @@ in
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.packages = [ home.packages = [
libreoffice-fresh libreoffice-fresh
gnome3.simple-scan gnome.simple-scan
# Tools like pdfunite # Tools like pdfunite
poppler_utils poppler_utils
# tool for annotating PDFs # tool for annotating PDFs

View file

@ -8,18 +8,15 @@ in
# No more than 50 chars. #### 50 chars is here: # # No more than 50 chars. #### 50 chars is here: #
# #
#
# Remember blank line between title and body.
#
# # ^ Remember ending with an extra blank line
# Body: Explain *what* and *why* (not *how*). Include issue number. # Body: Explain *what* and *why* (not *how*). Include issue number.
# Wrap at 72 chars. ################################## which is here: # # Wrap at 72 chars. ################################## which is here: #
# #
#
# ^ Remember ending with an extra blank line
# At the end: Include Co-authored-by for all contributors. # At the end: Include Co-authored-by for all contributors.
# Include at least one empty line before it. Format:
# #
Co-authored-by: ${user.fullName} <${user.email}> Co-authored-by: ${user.fullName} <${user.email}>