erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:dfe51e396b1a8680ef903d05f7b639044f88fd1d
Branches Tags
erwin:main
...
compare: erwin:b3aa9a97d201b85642b879a6c9f41b73f692ea55
Branches Tags
erwin:main

5 commits
dfe51e396b ... b3aa9a97d2

Author SHA1 Message Date
Erwin Boskma
b3aa9a97d2
Set EDITOR to command line emacs, add VISUAL env var 2024-11-13 17:23:55 +01:00
Erwin Boskma
0ac1606a38
git: Set options for difftastic 2024-11-13 17:23:27 +01:00
Erwin Boskma
fef597572c
emacs: Fix auto-insert for c++ 2024-11-13 17:23:11 +01:00
Erwin Boskma
ad8fc76af1
jujutsu: init module 2024-11-13 17:22:55 +01:00
Erwin Boskma
810ba3d165
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/e94b9aef9633ffb9ea2bebe8c9b999618ec15109?narHash=sha256-E8Caw6l/73iVFEYGch8Yc31fXCtSY30xxb%2BCsTN1gG0%3D' (2024-11-11)
  → 'github:nix-community/emacs-overlay/395675b281ab1aea12ab75a6296b83e3b3152f13?narHash=sha256-AtyI66bBn9IX9s%2BrXQEJHrkAQv3430urS6IxK5m1Uzs%3D' (2024-11-13)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/83fb6c028368e465cd19bb127b86f971a5e41ebc?narHash=sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0%3D' (2024-11-07)
  → 'github:NixOS/nixpkgs/9256f7c71a195ebe7a218043d9f93390d49e6884?narHash=sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc%3D' (2024-11-10)
• Updated input 'nixos-facter-modules':
    'github:numtide/nixos-facter-modules/d0e205eafca7091caad3925ff82a46fea08351e1?narHash=sha256-2KexAe17KRg2191SdBxVXqJKwV6MxKzlE35DDcAX%2BDs%3D' (2024-11-05)
  → 'github:numtide/nixos-facter-modules/505386dda29452140f93734509b03de57986af57?narHash=sha256-azk9oxzHkfYZcgBzAK3J9qdUQG0UjLSOjt8KzJ9rb8g%3D' (2024-11-12)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7?narHash=sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg%3D' (2024-11-06)
  → 'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991?narHash=sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI%3D' (2024-11-12)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/d70155fdc00df4628446352fc58adc640cd705c2?narHash=sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF%2B06nOg%3D' (2024-11-05)
  → 'github:cachix/git-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0?narHash=sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf%2BInnSMT4jlMU%3D' (2024-11-11)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/7c4cd99ed7604b79e8cb721099ac99c66f656b3a?narHash=sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI%3D' (2024-11-11)
  → 'github:oxalica/rust-overlay/2c19bad6e881b5a154cafb7f9106879b5b356d1f?narHash=sha256-WZ5rpjr/wCt7yBOUsvDE2i22hYz9g8W921jlwVktRQ4%3D' (2024-11-13)
• Updated input 'sops':
    'github:Mic92/sops-nix/f1675e3b0e1e663a4af49be67ecbc9e749f85eb7?narHash=sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus%3D' (2024-11-10)
  → 'github:Mic92/sops-nix/4c91d52db103e757fc25b58998b0576ae702d659?narHash=sha256-HC0anOL%2BKmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA%3D' (2024-11-11)
 2024-11-13 09:19:21 +01:00
6 changed files with 120 additions and 24 deletions
Show stats Expand all files Collapse all files

42
flake.lock
View file

@ -171,11 +171,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1731290007,
"narHash": "sha256-E8Caw6l/73iVFEYGch8Yc31fXCtSY30xxb+CsTN1gG0=",
"lastModified": 1731463490,
"narHash": "sha256-AtyI66bBn9IX9s+rXQEJHrkAQv3430urS6IxK5m1Uzs=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "e94b9aef9633ffb9ea2bebe8c9b999618ec15109",
"rev": "395675b281ab1aea12ab75a6296b83e3b3152f13",
"type": "github"
},
"original": {
@ -509,11 +509,11 @@
},
"nixos-facter-modules": {
"locked": {
"lastModified": 1730798058,
"narHash": "sha256-2KexAe17KRg2191SdBxVXqJKwV6MxKzlE35DDcAX+Ds=",
"lastModified": 1731425281,
"narHash": "sha256-azk9oxzHkfYZcgBzAK3J9qdUQG0UjLSOjt8KzJ9rb8g=",
"owner": "numtide",
"repo": "nixos-facter-modules",
"rev": "d0e205eafca7091caad3925ff82a46fea08351e1",
"rev": "505386dda29452140f93734509b03de57986af57",
"type": "github"
},
"original": {
@ -524,11 +524,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1730919458,
"narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
"lastModified": 1731403644,
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"type": "github"
},
"original": {
@ -567,11 +567,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730963269,
"narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
"lastModified": 1731239293,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"type": "github"
},
"original": {
@ -651,11 +651,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1730814269,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github"
},
"original": {
@ -697,11 +697,11 @@
]
},
"locked": {
"lastModified": 1731292155,
"narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=",
"lastModified": 1731464916,
"narHash": "sha256-WZ5rpjr/wCt7yBOUsvDE2i22hYz9g8W921jlwVktRQ4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a",
"rev": "2c19bad6e881b5a154cafb7f9106879b5b356d1f",
"type": "github"
},
"original": {
@ -718,11 +718,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1731213149,
"narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
"lastModified": 1731364708,
"narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
"rev": "4c91d52db103e757fc25b58998b0576ae702d659",
"type": "github"
},
"original": {

2
home-manager/modules/emacs/config.org
View file

@ -1425,7 +1425,7 @@ Enable and configure =auto-insert-mode= for Horus projects
(when (file-executable-p my/generate-cpp-file-executable)
(define-auto-insert
(rx ".[ch]pp" eos)
"\\.[ch]pp\\'"
(lambda nil (call-process my/generate-cpp-file-executable nil t nil buffer-file-name))))

2
home-manager/modules/git/default.nix
View file

@ -74,6 +74,8 @@ in
difftastic = {
enable = true;
background = "dark";
display = "inline";
};
aliases = {

84
home-manager/modules/jujutsu/default.nix Normal file
View file

@ -0,0 +1,84 @@
{
pkgs,
config,
lib,
...
}:
with lib;
let
cfg = config.eboskma.programs.jujutsu;
in
{
options.eboskma.programs.jujutsu = {
enable = mkEnableOption "jujutsu";
name = mkOption {
description = "your name";
type = types.nonEmptyStr;
};
email = mkOption {
description = "your e-mail address";
type = types.nonEmptyStr;
};
signingKey = mkOption {
description = "your signing key";
type = types.nullOr types.str;
default = null;
};
signingBackend = mkOption {
description = "the type of signing key";
type = types.enum [
"gpg"
"ssh"
];
default = "openpgp";
};
};
config = mkIf cfg.enable {
programs.jujutsu = {
enable = true;
settings = {
user = {
name = cfg.name;
email = cfg.email;
};
core = {
fsmonitor = "watchman";
watchman.register_snapshot_triggers = true;
};
ui = {
diff = {
tool = "difftastic";
};
pager = lib.getExe pkgs.bat;
};
diff.difftastic = {
program = lib.getExe pkgs.difftastic;
diff-args = [
"--color=auto"
"--background=dark"
"--display=side-by-side-show-both"
"$left"
"$right"
];
};
signing = {
sign-all = true;
backend = cfg.signingBackend;
key = cfg.signingKey;
};
};
};
home.packages = with pkgs; [ watchman ];
};
}

3
users/erwin/home.nix
View file

@ -199,7 +199,8 @@ in
username = "erwin";
homeDirectory = "/home/erwin";
sessionVariables = {
EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacs -nw";
VISUAL = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
};
stateVersion = "24.05";

11
users/erwin/work.nix
View file

@ -93,6 +93,13 @@ in
}
];
};
jujutsu = {
enable = true;
name = "Erwin Boskma";
email = "erwin@horus.nu";
signingKey = "~/.ssh/id_ed25519_sk_horus.pub";
signingBackend = "ssh";
};
mpd.enable = true;
neovim.enable = true;
nushell.enable = true;
@ -215,7 +222,8 @@ in
username = "erwin";
homeDirectory = "/home/erwin";
sessionVariables = {
EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacs -nw";
VISUAL = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
};
stateVersion = "24.05";
@ -266,6 +274,7 @@ in
ripgrep
s-tui
stress
tio
units
unzip
xdg-utils