diff --git a/home/alex/cli.nix b/home/alex/cli.nix index 2efaddb..774a738 100644 --- a/home/alex/cli.nix +++ b/home/alex/cli.nix @@ -14,9 +14,6 @@ in { ./programs/neovim/default.nix ./programs/emacs/default.nix ./programs/editorconfig - ./programs/jq - ./programs/fzf - ./programs/git ]; programs.home-manager.enable = true; @@ -64,6 +61,7 @@ in { htop-vim # htop with vim bindings erdtree # du+tree had sex dua # ncdu but better + fzf gopass gopass-jsonapi @@ -150,6 +148,15 @@ 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/fzf/default.nix b/home/alex/programs/fzf/default.nix deleted file mode 100644 index 92b7590..0000000 --- a/home/alex/programs/fzf/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.fzf = { enable = true; }; -} diff --git a/home/alex/programs/git/default.nix b/home/alex/programs/git/default.nix deleted file mode 100644 index 21f6fc9..0000000 --- a/home/alex/programs/git/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ 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; }; -} diff --git a/home/alex/programs/jq/default.nix b/home/alex/programs/jq/default.nix deleted file mode 100644 index 22b3462..0000000 --- a/home/alex/programs/jq/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.jq = { enable = true; }; -} diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index d38e601..d863423 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -16,7 +16,6 @@ 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 deleted file mode 100644 index 782a467..0000000 --- a/modules/appimage.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ 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"; - }; -}