walkah/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: walkah:52b24a13eb5206cb7d8944ecd0cda40b08333f1e
Branches Tags
walkah:main
...
compare: walkah:0e7be442abf430bcec6333f639cb19c17639e03a
Branches Tags
walkah:main

3 Commits
52b24a13eb ... 0e7be442ab

Author SHA1 Message Date
James Walker
0e7be442ab
💥 switch ssh git commit signing 2023-10-13 21:38:41 -04:00
James Walker
05a036a07b
📦 back to emacs 28 2023-10-13 21:36:02 -04:00
James Walker
115f8f5bfa
🚨 statix fix 2023-10-13 21:27:42 -04:00
4 changed files with 24 additions and 20 deletions
Show Stats Expand all files Collapse all files

24
flake.lock generated
View File

@ -21,11 +21,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1692799911, "lastModified": 1694529238,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,11 +80,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694134858, "lastModified": 1696940889,
"narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "19c6a4081b14443420358262f8416149bd79561a", "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694062546, "lastModified": 1697009197,
"narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=", "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547", "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,11 +136,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1692274144, "lastModified": 1696846637,
"narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
home.nix
View File

@ -4,8 +4,10 @@
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
home.username = "walkah"; home = {
home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah"; username = "walkah";
homeDirectory = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah";
};
imports = [ imports = [
./modules ./modules

2
modules/emacs.nix
View File

@ -16,7 +16,7 @@
programs = { programs = {
emacs = { emacs = {
enable = true; enable = true;
package = pkgs.emacs29-nox; package = pkgs.emacs-nox;
extraPackages = epkgs: [ epkgs.vterm ]; extraPackages = epkgs: [ epkgs.vterm ];
}; };
}; };

12
modules/git.nix
View File

@ -1,6 +1,9 @@
_: _:
{ {
# Allowed signers for git commit signing (referenced below).
home.file.".ssh/allowed_signers".text = "walkah@walkah.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl";
programs = { programs = {
gh = { gh = {
enable = true; enable = true;
@ -22,15 +25,14 @@ _:
}; };
extraConfig = { extraConfig = {
commit.gpgsign = true;
github.user = "walkah"; github.user = "walkah";
gpg.format = "ssh";
gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
init.defaultBranch = "main"; init.defaultBranch = "main";
pull.rebase = true; pull.rebase = true;
rebase.autoStash = true; rebase.autoStash = true;
}; user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl";
signing = {
key = "8896FEC44D47A81C";
signByDefault = true;
}; };
}; };
}; };