diff options
author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-25 18:13:25 +0200 |
---|---|---|
committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-25 18:13:25 +0200 |
commit | ad9a652748a364565001a0aee0a20596526ba6d2 (patch) | |
tree | 8f52dd87667651057fd920a0460ad23219e84f70 | |
parent | fix(yambar): Correctly specify the `yambar-{cpu,memory}` binaries (diff) | |
download | nixos-config-ad9a652748a364565001a0aee0a20596526ba6d2.tar.gz nixos-config-ad9a652748a364565001a0aee0a20596526ba6d2.zip |
chore(version): v1.38.0
-rw-r--r-- | CHANGELOG.md | 170 | ||||
-rw-r--r-- | modules/home/conf/git/aliases.nix | 5 | ||||
-rwxr-xr-x | pkgs/by-name/gi/git-cleanup/git-cleanup.sh | 45 |
3 files changed, 194 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cbdaf1c..ff2f435b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,176 @@ All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. - - - +## v1.38.0 - 2024-05-25 +#### Bug Fixes +- **(.gitattributes)** Remove unneeded paths - (8520aad) - Soispha +- **(flake)** Correctly export the overlayed package set as `legacyPackages` - (feb8581) - Soispha +- **(flake)** Import my modules stuck in nixpkgs prs directly - (bc388c1) - Soispha +- **(flake)** Use new vendored `generate_firefox_extensions` binary - (9cbf708) - Soispha +- **(flake/nixosConfigurations)** Adapt to new module structure - (a6af2ad) - Benedikt Peetz +- **(flake/packages)** Adapt the exposed `nvim` to the `pkgs` set changes - (40e58f6) - Benedikt Peetz +- **(git/aliases)** Add missing config attrs - (50b7c4d) - Benedikt Peetz +- **(hm/conf/firefox/conf/search)** Update home-manager options search url - (904c63d) - Benedikt Peetz +- **(hm/conf/firefox/conf/search)** Change nixos wiki to new domain - (b9885d3) - Benedikt Peetz +- **(hm/conf/firefox/extensions)** Remove torproject-snowflake temporarily - (8974745) - Soispha +- **(hm/conf/firefox/scripts/generate_extensions)** Re-activate snowflake - (46b5cb7) - Benedikt Peetz +- **(hm/conf/git)** Update the default key to my new gpg key - (fe35300) - Benedikt Peetz +- **(hm/conf/gpg)** Set correct gpg home variable - (3c2f28f) - Benedikt Peetz +- **(hm/conf/gpg)** Allow mutable keys and thus remove old keys - (e8aca66) - Benedikt Peetz +- **(hm/conf/gpg)** Remove `onlykey` specific configuration - (efe1a35) - Benedikt Peetz +- **(hm/conf/gpg)** Add my nixpkgs fork to ensure a working gpg-agent - (9ce56f0) - Soispha +- **(hm/conf/lf)** Correctly implement symlink following - (f842133) - Benedikt Peetz +- **(hm/conf/lf/icons)** Also use the key icon for `COPYING` - (6cfc665) - Benedikt Peetz +- **(hm/conf/lf/keybindings)** Use the autogenerate cd mappings - (55c530a) - Benedikt Peetz +- **(hm/conf/nvim/plgs/debugprint)** Remove - (ed76902) - Benedikt Peetz +- **(hm/conf/nvim/plgs/lsp/servers/ltex)** Don't use in html files - (1ca13d0) - Benedikt Peetz +- **(hm/conf/nvim/plgs/vim-tex)** Set `outdir` on latex command - (cc2e8ef) - Soispha +- **(hm/conf/python)** Create history file, if it does not exist - (746ae8c) - Benedikt Peetz +- **(hm/conf/python)** Correctly tell python to use a history file - (d2b0cee) - Benedikt Peetz +- **(hm/conf/unison)** Remove auto merge feature - (41e1bf2) - Soispha +- **(hm/conf/yambar/scripts/mpd)** Put a separator between title and time - (016b2b7) - Soispha +- **(hm/wms/river/init)** Restore the pre 3.0 forced ssd - (2d36139) - Benedikt Peetz +- **(hosts/tiamat)** Also use new services modules - (a842acd) - Benedikt Peetz +- **(hosts/tiamat/hardware)** Avoid having a suspended Bluetooth controller - (7a24bd6) - Benedikt Peetz +- **(modules/home)** Use the canonical package name from `by-name` - (047d2bc) - Benedikt Peetz +- **(modules/home/conf/gpg/keys/key_1)** Add key fingerprint - (d8d92aa) - Benedikt Peetz +- **(modules/home/pkgs/brightness)** Only include on laptops - (f2fa065) - Benedikt Peetz +- **(modules/services/nix)** Add my overlayed `nixpkgs` to the flake - (2dfef51) - Benedikt Peetz +- **(modules/system)** Actually import the `home-manager` module - (5a13b10) - Benedikt Peetz +- **(modules/system)** Re-add the laptop settings for home-manager comp - (6b543fb) - Benedikt Peetz +- **(modules/system/cleanup)** Remove unneeded `nano` dependency - (0796ed4) - Benedikt Peetz +- **(modules/system/documentation)** Avoid including all modules - (0cc7c1d) - Benedikt Peetz +- **(modules/system/home-manager)** Import soispha's hm config - (625ed3a) - Benedikt Peetz +- **(modules/system/networking)** Enforce mutually exclusivity between networkd and NetworkManager - (4b28aa4) - Benedikt Peetz +- **(modules/system/nixpkgs)** Remove duplicated `config` attr name - (3f9e7bb) - Benedikt Peetz +- **(modules/system/services{adb,backup})** Add `services` to option path - (6a6229b) - Benedikt Peetz +- **(modules/system/{hardware,fonts})** Fix typesystem stuff - (7489788) - Benedikt Peetz +- **(modules/system/{tempfiles,services/steam})** Fix typos - (2e88237) - Benedikt Peetz +- **(pkgs)** Remove unneeded copied files - (01e862f) - Benedikt Peetz +- **(pkgs/by-name/na/neorg)** Adapt values to the `by-name` change - (38a081a) - Benedikt Peetz +- **(pkgs/by-name/ya/yambar-{memory,cpu})** Add devshell - (5e9c03d) - Benedikt Peetz +- **(pkgs/by-name/{tr,ya})** Move away from `crane.lib.${system}` - (ff6b516) - Benedikt Peetz +- **(pkgs/scripts/aumo)** Add required dependencies (and remove old ones) - (06c4ea7) - Soispha +- **(pkgs/scripts/fupdate)** Ignore args after `--` - (f924002) - Soispha +- **(pkgs/scripts/fupdate)** Avoid polluting the arguments of the update script - (f69de99) - Soispha +- **(pkgs/scripts/fupdate)** Avoid inversion in check for --no-script - (17c6a92) - Soispha +- **(pkgs/scripts/neorg/review)** Use dataHome to store data - (ac340c1) - Soispha +- **(pkgs/scripts/update-sys)** Add new `systemd-run` dependency - (bb4ede2) - Soispha +- **(pkgs/update.sh)** Ensure that the `nix flake update` check works - (67cb8aa) - Benedikt Peetz +- **(pkgs/update.sh)** Update to the new `by-name` convention - (16ed377) - Benedikt Peetz +- **(sys/boot)** Restore the bootsetup to the status quo - (7ff60a4) - Benedikt Peetz +- **(sys/boot)** Always update the config-file - (1681647) - Benedikt Peetz +- **(sys/boot)** Include a parameter for the device the iso is stored on - (21c1c29) - Benedikt Peetz +- **(sys/boot)** Use a disk backed directory to store the big iso - (1d4f3e7) - Benedikt Peetz +- **(sys/boot)** Also apply the `systemd-boot` settings, when lanzaboote is active - (b649d1d) - Benedikt Peetz +- **(sys/git_revision)** Use long git rev - (c8550da) - Soispha +- **(sys/hardware)** Enable the nitrokey udev rules - (600bb0b) - Benedikt Peetz +- **(sys/libvirt)** Disable, as tiamat can't build `ceph` - (e580ca9) - Benedikt Peetz +- **(sys/nixpkgs)** All the unfree 'pypemicro' - (159585e) - Benedikt Peetz +- **(sys/pkgs/comments)** Don't require `sponsorblock_chapters` - (c787885) - Benedikt Peetz +- **(sys/pkgs/yt)** Don't require an thumbnail url - (5c84fd1) - Benedikt Peetz +- **(sys/secrets)** Remove unused serverphone secrets - (4e72dea) - Benedikt Peetz +- **(sys/secrets/lf/cd_paths)** Regenerate - (d807b43) - Benedikt Peetz +- **(sys/sound)** Disable setting the default volume - (c2228a1) - Soispha +- **(sys/svcs/nix)** Use my overlayed nixpkgs in the `n` registry entry - (58f7723) - Benedikt Peetz +- **(sys/users/soispha)** Add my new ssh key - (3a0cf8f) - Benedikt Peetz +- **(treewide)** Remove nheko module and associated secrets - (394792e) - Benedikt Peetz +- **(treewide)** Use `nixVersions.latest` instead of just `nix` - (4007f50) - Benedikt Peetz +- **(treewide)** `Upgrade` the Cargo.toml file before `updating` the Cargo.lock - (477cbf3) - Benedikt Peetz +- **(treewide)** Update the shell library version - (b755ab3) - Soispha +- **(update.sh)** Ensure unique variables - (9bdd2fa) - Benedikt Peetz +- **(update.sh)** Use more descriptive names for the toplevel update.sh scripts - (d1f6e8f) - Benedikt Peetz +- **(yambar)** Correctly specify the `yambar-{cpu,memory}` binaries - (5ce5da9) - Benedikt Peetz +#### Build system +- **(flake)** Update - (eb8f97e) - Benedikt Peetz +- **(flake)** Update - (952608f) - Benedikt Peetz +- **(flake)** Deduplicate `treefmt-nix` input for `templates` - (b249b8e) - Benedikt Peetz +- **(flake)** Update - (1511e69) - Soispha +- **(flake)** Update - (cbd5e0d) - Soispha +- **(treewide)** Update - (f23e3fe) - Benedikt Peetz +- **(treewide)** Update - (9f61ad5) - Benedikt Peetz +- **(treewide)** Update - (acb2fbb) - Benedikt Peetz +- **(treewide)** Update - (7e4f747) - Benedikt Peetz +- **(treewide)** Update flake.lock files - (97eb43a) - Benedikt Peetz +- **(treewide)** Update - (5b68e0f) - Soispha +- **(treewide)** Update - (028932f) - Soispha +#### Documentation +- **(notes/git_crypt)** Add information on how to remove `git-crypt` - (678c6ca) - Benedikt Peetz +- **(pkgs)** Add TODO regarding the lack of source filtering - (a9e3a8b) - Benedikt Peetz +- **(pkgs/scripts/fupdate)** Add somewhat better documentation - (3796fe8) - Soispha +#### Features +- **(hm/conf/firefox/conf/search)** Add a direct nixos github pr search - (de95ee6) - Benedikt Peetz +- **(hm/conf/gpg)** Use my gpg key as an ssh key - (02d3a05) - Benedikt Peetz +- **(hm/conf/gpg/keys)** Add my new gpg key - (c5dd5df) - Benedikt Peetz +- **(hm/conf/lf/cmd/make_link)** Always make relative links - (8396b01) - Soispha +- **(hm/conf/lf/keybindings)** Add a keybind to follow symnlinks - (8557090) - Benedikt Peetz +- **(hm/conf/nvim/plgs/lsp/servers)** Replace eslint by quick-lint-js - (6274293) - Benedikt Peetz +- **(hm/conf/nvim/plgs/lsp/servers/eslint)** Init - (346c0e9) - Benedikt Peetz +- **(hm/conf/prusa_slicer)** Init - (9281388) - Soispha +- **(hm/conf/yambar/mpd)** Add song progress and duration information - (e0da62d) - Soispha +- **(hosts/{tiamat,apzu}/hardware)** Don't always enable the bluetooth controller - (f611729) - Benedikt Peetz +- **(modules/system/issue_file)** Add the last modification date - (1405d29) - Benedikt Peetz +- **(pkgs)** Add a `git-cleanup` script - (c6e29c9) - Benedikt Peetz +- **(pkgs)** Pull yambar-{cpu,memory} in tree - (6364782) - Benedikt Peetz +- **(pkgs/generate_moz_extensions)** Vendor it - (8816ccb) - Soispha +- **(pkgs/lf-make-map)** Add de-serialization to lf mappings - (16c7608) - Benedikt Peetz +- **(pkgs/lf-make-map)** Support depths > 2 - (f46d845) - Benedikt Peetz +- **(pkgs/lf-make-map)** Ensure that it works (for a depth=1) - (13539f1) - Benedikt Peetz +- **(pkgs/lf-make-map)** Implement all needed details to produce first mappings - (5a27c1f) - Benedikt Peetz +- **(pkgs/lf-make-map)** Change the key to custom type and add visuals - (47e3b82) - Benedikt Peetz +- **(pkgs/lf-make-map)** Init - (023b7cd) - Benedikt Peetz +- **(pkgs/scripts/fupdate)** Generate completions - (dc2c35b) - Soispha +- **(pkgs/scripts/fupdate)** Add support for updating without running the script - (4b08138) - Soispha +- **(pkgs/scripts/neorg/review)** Only review opened projects - (d475107) - Soispha +- **(pkgs/scripts/spodi)** Rewrite to support artist `update` - (73cb8c5) - Soispha +- **(pkgs/update.sh)** Notify the user about the run update scripts - (1f3a4fb) - Benedikt Peetz +- **(sys/boot)** Provide the latest arch-iso as boot target - (e67d268) - Benedikt Peetz +- **(sys/pkgs/scripts/update-sys)** Enable completions - (200c103) - Benedikt Peetz +- **(sys/secrets/lf/cd_paths)** Generate with `lf-make-map` - (5fcdae1) - Benedikt Peetz +#### Miscellaneous Chores +- **(COPYING)** Finally add - (1d5e1d7) - Benedikt Peetz +- **(flake)** Deduplicate inputs with nixvim - (8aa5056) - Benedikt Peetz +- **(hm/conf/task/projects)** Update - (1b0b633) - Benedikt Peetz +- **(treewide)** Fully remove any last mentions of git-crypt - (19f7840) - Benedikt Peetz +- **(treewide)** Remove git crypt - (5d87640) - Benedikt Peetz +- **(treewide)** Conform to changed settings - (7b4ff39) - Benedikt Peetz +- **(treewide)** Move away from git-crypt - (815dfcc) - Soispha +#### Refactoring +- **(flake)** Update to new pkgs set - (42d0d64) - Benedikt Peetz +- **(flake)** Use an attrs for including open prs - (541a666) - Soispha +- **(flake/packages)** Export the new pkgs set - (5d2ab82) - Benedikt Peetz +- **(git)** Move aliases to their own file - (85af021) - Benedikt Peetz +- **(git/scripts)** Upgrade `git-cm` to a 'real' package - (6816c8e) - Benedikt Peetz +- **(hm)** Rename to `modules/home` - (5156e1a) - Benedikt Peetz +- **(hm/conf/nvim)** Use `opts` instead of `options` - (db59561) - Soispha +- **(hm/conf/nvim/plgs/comment-nvim)** Update to new module layout - (d9d00a3) - Soispha +- **(hm/conf/nvim/plgs/{nvim-cmp,vim-tex})** Update to new attr names - (499ef17) - Soispha +- **(hm/conf/zsh)** Remove old zsh-prompt file - (269b27d) - Benedikt Peetz +- **(hm/conf/zsh)** Move xdg vars under the xdg directory - (d1f0747) - Benedikt Peetz +- **(hm/wms/river/init)** Update to river 3.0 - (c9b81cd) - Benedikt Peetz +- **(hosts/apzu)** Use new modules - (64aa355) - Benedikt Peetz +- **(hosts/tiamat)** Adapt to the new modules for system - (bb00925) - Benedikt Peetz +- **(modules/home)** Setup as "normal" NixOS module - (fd9b0ec) - Benedikt Peetz +- **(modules/home/pkgs)** Readd whilst using the new `pkgs` - (c4a11ed) - Benedikt Peetz +- **(nixpkgs)** Configure nixpkgs via the module system - (96bf5aa) - Benedikt Peetz +- **(pkgs)** Categorize into `by-name` shards - (204731c) - Benedikt Peetz +- **(pkgs/by-name/vi/vim-plugins)** Give nixpkgs compatible name - (f07dd1d) - Benedikt Peetz +- **(sys)** Modularize and move to `modules/system` or `pkgs` - (368cb6b) - Benedikt Peetz +- **(sys/pkgs/comments)** Use better direnv api, instead of bare `.env` file - (8188a35) - Benedikt Peetz +- **(sys/pkgs/neorg/nu)** Delete the canceled try at a nu rewrite - (f237724) - Benedikt Peetz +- **(treewide)** Update to new modules names (and simplify some code) - (40bdcae) - Soispha +#### Style +- **(hm/wms/river/init)** Accept shfmt's format :( - (5d98c83) - Benedikt Peetz +- **(treewide)** Format - (7d3aaa9) - Benedikt Peetz +- **(treewide)** Reformat - (f0a8506) - Benedikt Peetz +- **(treewide)** Format - (1e1c9a9) - Benedikt Peetz +- **(treewide)** Comply with `nix fmt` - (d0ab646) - Benedikt Peetz +- **(treewide)** Format - (831a43a) - Soispha +- **(treewide)** Format - (8057372) - Soispha +- **(treewide)** Format - (03b4d21) - Soispha + +- - - + ## v1.37.0 - 2024-03-01 #### Bug Fixes - **(pkgs/scripts/mpc-fav)** Update database after adding a new favorite - (d320e63) - Soispha diff --git a/modules/home/conf/git/aliases.nix b/modules/home/conf/git/aliases.nix index a9536e9a..15bf613d 100644 --- a/modules/home/conf/git/aliases.nix +++ b/modules/home/conf/git/aliases.nix @@ -1,4 +1,7 @@ -{lib, config}: { +{ + lib, + config, +}: { cmr = "commit --file .git/COMMIT_EDITMSG --edit --verbose"; st = "status"; diff --git a/pkgs/by-name/gi/git-cleanup/git-cleanup.sh b/pkgs/by-name/gi/git-cleanup/git-cleanup.sh index 1ab7bbd1..a6d8805a 100755 --- a/pkgs/by-name/gi/git-cleanup/git-cleanup.sh +++ b/pkgs/by-name/gi/git-cleanup/git-cleanup.sh @@ -4,7 +4,7 @@ SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH help() { - cat << EOF + cat <<EOF Automatically remove merged branches (remote and local) USAGE: @@ -30,48 +30,43 @@ get_default_branch() { } cleanup() { - default_branch="$(get_default_branch)"; + default_branch="$(get_default_branch)" - merged_branches="$(git branch --merged "$default_branch" --no-contains "$default_branch" --format='%(refname:short)')"; + merged_branches="$(git branch --merged "$default_branch" --no-contains "$default_branch" --format='%(refname:short)')" [ "$merged_branches" ] && git branch --delete "$merged_branches" } cleanup_remote() { - default_branch="$(get_default_branch)"; + default_branch="$(get_default_branch)" - merged_branches="$(git branch --remotes --merged "$default_branch" --no-contains "$default_branch" --format='%(refname:short)' | sed 's|origin/||')"; + merged_branches="$(git branch --remotes --merged "$default_branch" --no-contains "$default_branch" --format='%(refname:short)' | sed 's|origin/||')" [ "$merged_branches" ] && git push --delete origin "$merged_branches" } - - -remote=false; +remote=false for arg in "$@"; do case "$arg" in - "--help" | "-h") - help; - exit 0; - ;; - "--version" | "-v") - version; - exit 0; - ;; - "--remote" | "-r") - remote=true; - ;; + "--help" | "-h") + help + exit 0 + ;; + "--version" | "-v") + version + exit 0 + ;; + "--remote" | "-r") + remote=true + ;; esac done - - - if [ "$remote" = "true" ]; then - cleanup_remote; + cleanup_remote elif [ "$remote" = "false" ]; then - cleanup; + cleanup else - die "BUG: 'remote' is not true or false but: '$remote'"; + die "BUG: 'remote' is not true or false but: '$remote'" fi # vim: ft=sh |