moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: moritz:108ee8e970b7dd1c447e9b3bee3fff29d2298094
Branches Tags
moritz:nixos
...
compare: moritz:1540b22752a40b3a9726b2bfabc5d4b5f2e7f53c
Branches Tags
moritz:nixos

7 commits
108ee8e970 ... 1540b22752

Author SHA1 Message Date
Moritz Böhme
1540b22752
Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos 2024-11-08 21:29:19 +01:00
Moritz Böhme
df2ffacc0f
feat: add rust_analyzer 2024-11-08 20:13:24 +01:00
Moritz Böhme
50c6072ee9
feat: enable mullvad on laptop 2024-11-08 20:02:11 +01:00
Moritz Böhme
a31054750a
feat: add nh 2024-11-08 20:00:36 +01:00
Moritz Böhme
e93f7ce742
fix: use first nixosConfiguration instead of hardcoded name 2024-11-08 19:41:56 +01:00
Moritz Böhme
05e34bcfc9
feat!: switch to lix 2024-11-08 19:40:51 +01:00
Moritz Böhme
9d7f36dbae
refactor(lazygit): move into own module 2024-11-08 19:39:26 +01:00
6 changed files with 109 additions and 77 deletions
Show stats Expand all files Collapse all files

1
hosts/nixos-laptop/default.nix
View file

@ -22,6 +22,7 @@
};
terminal.package = pkgs.kitty;
programs.exercism.enable = true;
services.mullvad.enable = true;
};
users.users.moritz.packages = [ pkgs.poetry ];

65
modules/profiles/base.nix
View file

@ -187,7 +187,6 @@ in
rs = "sudo systemctl";
uj = "journalctl --user";
rj = "sudo journalctl";
lg = "lazygit";
};
aliases = {
ls = "${getExe pkgs.eza} -lh --icons --git";
@ -198,6 +197,7 @@ in
variables = { EDITOR = "vim"; };
};
programs = {
lazygit.enable = true;
direnv.enable = true;
fish.enable = true;
git.enable = true;
@ -265,6 +265,10 @@ in
programs = {
mtr.enable = true;
command-not-found.enable = false;
nh = {
enable = true;
flake = "/home/moritz/Documents/dotfiles/";
};
};
services = {
@ -299,65 +303,6 @@ in
];
};
starship.enable = true;
lazygit.enable = true;
lazygit.settings = {
customCommands = [
{
key = "<c-v>";
context = "global";
description = "Create new conventional commit";
prompts = [
{
type = "menu";
key = "Type";
title = "Type of change";
options = [
{ name = "build"; description = "Changes that affect the build system or external dependencies"; value = "build"; }
{ name = "feat"; description = "A new feature"; value = "feat"; }
{ name = "fix"; description = "A bug fix"; value = "fix"; }
{ name = "chore"; description = "Other changes that don't modify src or test files"; value = "chore"; }
{ name = "ci"; description = "Changes to CI configuration files and scripts"; value = "ci"; }
{ name = "docs"; description = "Documentation only changes"; value = "docs"; }
{ name = "perf"; description = "A code change that improves performance"; value = "perf"; }
{ name = "refactor"; description = "A code change that neither fixes a bug nor adds a feature"; value = "refactor"; }
{ name = "revert"; description = "Reverts a previous commit"; value = "revert"; }
{ name = "style"; description = "Changes that do not affect the meaning of the code"; value = "style"; }
{ name = "test"; description = "Adding missing tests or correcting existing tests"; value = "test"; }
];
}
{
type = "input";
title = "Scope";
key = "Scope";
initialValue = "";
}
{
type = "menu";
key = "Breaking";
title = "Breaking change";
options = [
{ name = "no"; value = ""; }
{ name = "yes"; value = "!"; }
];
}
{
type = "input";
title = "message";
key = "Message";
initialValue = "";
}
{
type = "confirm";
key = "Confirm";
title = "Commit";
body = "Are you sure you want to commit?";
}
];
command = "git commit --message '{{.Form.Type}}{{ if .Form.Scope }}({{ .Form.Scope }}){{ end }}{{.Form.Breaking}}: {{.Form.Message}}'";
loadingText = "Creating conventional commit...";
}
];
};
};
home = {
username = "moritz";

1
modules/profiles/impermanence.nix
View file

@ -27,6 +27,7 @@ in
"/var/lib/nixos"
"/var/lib/systemd"
"/var/log"
"/etc/mullvad-vpn/"
];
files = [
"/etc/machine-id"

95
modules/programs/lazygit.nix Normal file
View file

@ -0,0 +1,95 @@
{ config
, lib
, pkgs
, ...
}:
with lib;
let
cfg = config.my.programs.lazygit;
wrapper = pkgs.writeShellApplication {
name = "lg";
text = ''
export LAZYGIT_NEW_DIR_FILE="$HOME/.lazygit/newdir"
lazygit "$@"
if [ -f "$LAZYGIT_NEW_DIR_FILE" ]; then
cd "$(cat "$LAZYGIT_NEW_DIR_FILE")"
rm -f "$LAZYGIT_NEW_DIR_FILE" > /dev/null
fi
'';
runtimeInputs = [ pkgs.lazygit ];
};
in
{
options.my.programs.lazygit.enable = mkEnableOption "lazygit";
config = mkIf cfg.enable {
home-manager.users.moritz.home.packages = [
wrapper
];
home-manager.users.moritz.programs.lazygit = {
enable = true;
settings = {
customCommands = [
{
key = "<c-v>";
context = "global";
description = "Create new conventional commit";
prompts = [
{
type = "menu";
key = "Type";
title = "Type of change";
options = [
{ name = "build"; description = "Changes that affect the build system or external dependencies"; value = "build"; }
{ name = "feat"; description = "A new feature"; value = "feat"; }
{ name = "fix"; description = "A bug fix"; value = "fix"; }
{ name = "chore"; description = "Other changes that don't modify src or test files"; value = "chore"; }
{ name = "ci"; description = "Changes to CI configuration files and scripts"; value = "ci"; }
{ name = "docs"; description = "Documentation only changes"; value = "docs"; }
{ name = "perf"; description = "A code change that improves performance"; value = "perf"; }
{ name = "refactor"; description = "A code change that neither fixes a bug nor adds a feature"; value = "refactor"; }
{ name = "revert"; description = "Reverts a previous commit"; value = "revert"; }
{ name = "style"; description = "Changes that do not affect the meaning of the code"; value = "style"; }
{ name = "test"; description = "Adding missing tests or correcting existing tests"; value = "test"; }
];
}
{
type = "input";
title = "Scope";
key = "Scope";
initialValue = "";
}
{
type = "menu";
key = "Breaking";
title = "Breaking change";
options = [
{ name = "no"; value = ""; }
{ name = "yes"; value = "!"; }
];
}
{
type = "input";
title = "message";
key = "Message";
initialValue = "";
}
{
type = "confirm";
key = "Confirm";
title = "Commit";
body = "Are you sure you want to commit?";
}
];
command = "git commit --message '{{.Form.Type}}{{ if .Form.Scope }}({{ .Form.Scope }}){{ end }}{{.Form.Breaking}}: {{.Form.Message}}'";
loadingText = "Creating conventional commit...";
}
];
};
};
};
}

17
modules/programs/nix.nix
View file

@ -10,12 +10,6 @@ let
inherit (lib) mkEnableOption mkOption types;
cfg = config.my.programs.nix;
mkNom = system: nix:
inputs.nix-monitored.packages.${system}.default.override
{
withNotify = false;
nix = nix;
};
in
{
options.my.programs.nix = {
@ -31,15 +25,6 @@ in
};
config = {
my.nixpkgs.overlays = [
(final: prev:
{
nixos-rebuild = prev.nixos-rebuild.override {
nix = mkNom final.system final.nix;
};
})
];
home-manager.users.moritz.programs.direnv.nix-direnv.package = pkgs.nix-direnv.override {
nix = config.nix.package;
};
@ -49,7 +34,7 @@ in
nix = {
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
package = pkgs.nix;
package = pkgs.lix;
extraOptions = ''
!include ${config.age.secrets.nix-github-token.path}

7
modules/programs/nvim/new_plugins/lsp.nix
View file

@ -8,6 +8,11 @@ in
plugins.lsp = {
enable = true;
inlayHints = true;
servers.rust_analyzer = {
enable = true;
installRustc = false;
installCargo = false;
};
servers.elixirls.enable = true;
servers.nextls.enable = true;
servers.nil_ls.enable = true;
@ -18,7 +23,7 @@ in
};
options = {
nixos = {
expr = ''(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.nixos-desktop.options'';
expr = ''builtins.head (builtins.attrValues ((builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations).options'';
};
"flake-parts" = {
expr = ''(builtins.getFlake ("git+file://" + toString ./.)).debug.options'';