From 2852efbbbca773665966f68b8fdcb087531cf4d7 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 30 Apr 2022 15:13:20 +0200 Subject: [PATCH 1/4] tree-wide: gnome3 -> gnome, add hicolor-icon-theme as fallback --- modules/crypto/default.nix | 2 +- modules/graphical/default.nix | 8 +++++--- modules/office/default.nix | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix index 8e9c5ee..712787a 100644 --- a/modules/crypto/default.nix +++ b/modules/crypto/default.nix @@ -30,7 +30,7 @@ in }; home.packages = [ - gnome3.seahorse + gnome.seahorse keepassxc libsecret qMasterPassword diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index bbf8f59..6910769 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -89,9 +89,11 @@ in flameshot libnotify - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome.eog - gnome3.nautilus + gnome.nautilus + gnome.yelp + hicolor-icon-theme wine @@ -112,7 +114,7 @@ in enable = true; font.name = "Lato"; iconTheme = { - package = pkgs.papirus-maia-icon-theme; + package = pkgs.papirus-icon-theme; name = "Papirus-Adapta-Nokto-Maia"; }; theme = { diff --git a/modules/office/default.nix b/modules/office/default.nix index c1b552b..204e3ae 100644 --- a/modules/office/default.nix +++ b/modules/office/default.nix @@ -17,7 +17,7 @@ in home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home.packages = [ libreoffice-fresh - gnome3.simple-scan + gnome.simple-scan # Tools like pdfunite poppler_utils # tool for annotating PDFs From 4b915053b4ec212e23ed7eadfa6e4ac94d3c9506 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 30 Apr 2022 20:57:35 +0200 Subject: [PATCH 2/4] zsh: precmd() don't echo trailing newline --- modules/terminal-life/zsh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix index daf437e..a612ed3 100644 --- a/modules/terminal-life/zsh/default.nix +++ b/modules/terminal-life/zsh/default.nix @@ -85,7 +85,7 @@ in stty erase '^?' precmd () { - echo -e "\e]2;$(pwd)\e\\" + echo -e -n "\e]2;$(pwd)\e\\" } # If a command is not found, show me where it is From 1f1ac4c575cab94b6c8cd466883f16ef90b4dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Sat, 30 Apr 2022 21:25:38 +0200 Subject: [PATCH 3/4] Add gitmessage template to global git config --- profiles/base-user/.config/git/config.nix | 1 + profiles/base-user/.config/git/gitmessage.nix | 35 +++++++++++++++++++ profiles/base-user/home.nix | 1 + 3 files changed, 37 insertions(+) create mode 100644 profiles/base-user/.config/git/gitmessage.nix diff --git a/profiles/base-user/.config/git/config.nix b/profiles/base-user/.config/git/config.nix index 53c53a7..2553ec6 100644 --- a/profiles/base-user/.config/git/config.nix +++ b/profiles/base-user/.config/git/config.nix @@ -24,6 +24,7 @@ in [commit] gpgsign = true + template = ${xdg.configHome}/git/gitmessage [tag] gpgsign = true [init] diff --git a/profiles/base-user/.config/git/gitmessage.nix b/profiles/base-user/.config/git/gitmessage.nix new file mode 100644 index 0000000..11cac0f --- /dev/null +++ b/profiles/base-user/.config/git/gitmessage.nix @@ -0,0 +1,35 @@ +{ config, pkgs, ... }: +let + user = config.pub-solar.user; + xdg = config.home-manager.users."${user.name}".xdg; +in +'' +# Title: Summary, imperative, start upper case, don't end with a period +# No more than 50 chars. #### 50 chars is here: # +# + +# +# Remember blank line between title and body. +# + +# +# Body: Explain *what* and *why* (not *how*). Include issue number. +# Wrap at 72 chars. ################################## which is here: # +# + +# +# 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}> + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# On branch master +# Your branch is up to date with 'origin/main'. +# +# Changes to be committed: +# new file: installation.md +# +'' diff --git a/profiles/base-user/home.nix b/profiles/base-user/home.nix index 6cb59b1..1ae6bd3 100644 --- a/profiles/base-user/home.nix +++ b/profiles/base-user/home.nix @@ -32,6 +32,7 @@ in xdg.mimeApps = import ./mimeapps.nix; xdg.configFile."git/config".text = import ./.config/git/config.nix { inherit config; inherit pkgs; }; + xdg.configFile."git/gitmessage".text = import ./.config/git/gitmessage.nix { inherit config; inherit pkgs; }; xdg.configFile."git/global_gitignore".text = import ./.config/git/global_gitignore.nix { inherit config; inherit pkgs; }; xdg.configFile."dircolors".source = ./.config/dircolors; xdg.configFile."xmodmap".source = ./.config/xmodmap; From 4c9dd20e4a85409244b36aee92aa1c8ebffc7e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Sat, 30 Apr 2022 21:35:32 +0200 Subject: [PATCH 4/4] better newlines --- profiles/base-user/.config/git/gitmessage.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/profiles/base-user/.config/git/gitmessage.nix b/profiles/base-user/.config/git/gitmessage.nix index 11cac0f..7f4b1c6 100644 --- a/profiles/base-user/.config/git/gitmessage.nix +++ b/profiles/base-user/.config/git/gitmessage.nix @@ -8,18 +8,15 @@ in # 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. # Wrap at 72 chars. ################################## which is here: # # -# + +# ^ Remember ending with an extra blank line # 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}>