From 313b19f7cf42db24de2b093a8a342817d1f6e5c5 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 12 Feb 2024 21:24:07 +0100 Subject: [PATCH 1/4] home: Enable 'jq' --- home/alex/cli.nix | 1 + home/alex/programs/jq/default.nix | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 home/alex/programs/jq/default.nix diff --git a/home/alex/cli.nix b/home/alex/cli.nix index 774a738..d0cfd6a 100644 --- a/home/alex/cli.nix +++ b/home/alex/cli.nix @@ -14,6 +14,7 @@ in { ./programs/neovim/default.nix ./programs/emacs/default.nix ./programs/editorconfig + ./programs/jq ]; programs.home-manager.enable = true; diff --git a/home/alex/programs/jq/default.nix b/home/alex/programs/jq/default.nix new file mode 100644 index 0000000..22b3462 --- /dev/null +++ b/home/alex/programs/jq/default.nix @@ -0,0 +1,5 @@ +{ config, lib, pkgs, ... }: + +{ + programs.jq = { enable = true; }; +} From 1b95bf2d2480517dfb19567addbebb7cc8706d23 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 12 Feb 2024 21:29:13 +0100 Subject: [PATCH 2/4] home: Enable 'fzf' --- home/alex/cli.nix | 2 +- home/alex/programs/fzf/default.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 home/alex/programs/fzf/default.nix diff --git a/home/alex/cli.nix b/home/alex/cli.nix index d0cfd6a..193bbaa 100644 --- a/home/alex/cli.nix +++ b/home/alex/cli.nix @@ -15,6 +15,7 @@ in { ./programs/emacs/default.nix ./programs/editorconfig ./programs/jq + ./programs/fzf ]; programs.home-manager.enable = true; @@ -62,7 +63,6 @@ in { htop-vim # htop with vim bindings erdtree # du+tree had sex dua # ncdu but better - fzf gopass gopass-jsonapi diff --git a/home/alex/programs/fzf/default.nix b/home/alex/programs/fzf/default.nix new file mode 100644 index 0000000..92b7590 --- /dev/null +++ b/home/alex/programs/fzf/default.nix @@ -0,0 +1,5 @@ +{ config, lib, pkgs, ... }: + +{ + programs.fzf = { enable = true; }; +} From feade6d9986aeaf2afd651fe65f7d556e381afb5 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 12 Feb 2024 22:01:50 +0100 Subject: [PATCH 3/4] feat(home): Enable git-cliff changelog generator --- home/alex/cli.nix | 10 +----- home/alex/programs/git/default.nix | 49 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 home/alex/programs/git/default.nix diff --git a/home/alex/cli.nix b/home/alex/cli.nix index 193bbaa..2efaddb 100644 --- a/home/alex/cli.nix +++ b/home/alex/cli.nix @@ -16,6 +16,7 @@ in { ./programs/editorconfig ./programs/jq ./programs/fzf + ./programs/git ]; programs.home-manager.enable = true; @@ -149,15 +150,6 @@ in { settings.git_protocol = "ssh"; }; - git = { - enable = true; - ignores = [ "*~" "*.swp" "result" "dist-newstyle" ]; - userEmail = user.mail; - userName = user.fullName; - aliases = { st = "status"; }; - extraConfig = { init.defaultBranch = "main"; }; - }; - gpg = { enable = true; settings = { homedir = "~/.local/share/gnupg"; }; diff --git a/home/alex/programs/git/default.nix b/home/alex/programs/git/default.nix new file mode 100644 index 0000000..21f6fc9 --- /dev/null +++ b/home/alex/programs/git/default.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +{ + programs.git = { + enable = true; + lfs.enable = true; + ignores = [ "*~" "*.swp" "result" "dist-newstyle" ]; + signing = { + key = "41A6D13FECA21280"; + signByDefault = false; + }; + delta = { enable = true; }; + # TODO create option for my own account meta data + userEmail = "me@failco.de"; + userName = "Alexander Kobjolke"; + aliases = { + a = "add"; + c = "commit"; + ca = "commit --amend"; + can = "commit --amend --no-edit"; + cl = "clone"; + cm = "commit -m"; + co = "checkout"; + cp = "cherry-pick"; + cpx = "cherry-pick -x"; + d = "diff"; + f = "fetch"; + fo = "fetch origin"; + fu = "fetch upstream"; + lol = "log --graph --decorate --pretty=oneline --abbrev-commit"; + lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all"; + pl = "pull"; + pr = "pull -r"; + ps = "push"; + psf = "push -f"; + rb = "rebase"; + rbi = "rebase -i"; + r = "remote"; + ra = "remote add"; + rr = "remote rm"; + rv = "remote -v"; + rs = "remote show"; + st = "status"; + }; + extraConfig = { init.defaultBranch = "main"; }; + }; + + programs.git-cliff = { enable = true; }; +} From eb041732fcf543120534809c41e1084084b27d10 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 12 Feb 2024 22:21:31 +0100 Subject: [PATCH 4/4] feat(dregil): Enable AppImage binfmt support --- hosts/dregil/configuration.nix | 1 + modules/appimage.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 modules/appimage.nix diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index d863423..d38e601 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -16,6 +16,7 @@ in { # Include the results of the hardware scan. ./hardware-configuration.nix # + ../../modules/appimage.nix ../../modules/wm/x.nix ../../modules/wm/xmonad/default.nix ]; diff --git a/modules/appimage.nix b/modules/appimage.nix new file mode 100644 index 0000000..782a467 --- /dev/null +++ b/modules/appimage.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: + +{ + boot.binfmt.registrations.appimage = { + wrapInterpreterInShell = false; + interpreter = "${pkgs.appimage-run}/bin/appimage-run"; + recognitionType = "magic"; + offset = 0; + mask = "\\xff\\xff\\xff\\xff\\x00\\x00\\x00\\x00\\xff\\xff\\xff"; + magicOrExtension = "\\x7fELF....AI\\x02"; + }; +}