Merge branch 'main' of github.com:thilobillerbeck/dotfiles

home-manager/modules/packages.nix

@@ -80,14 +80,14 @@ in
 
         # FPGA stuff
         yosys
-        # nextpnr
+        nextpnr
         icestorm
         icebreaker
 
         php
         (lib.hiPrio phpPackages.composer)
 
-        rns
+        btop
       ]
       ++ (
         if (!config.machine.isGeneric) then

home-manager/programs/git.nix

@@ -6,6 +6,8 @@
     lfs.enable = true;
     userEmail = "thilo.billerbeck@officerent.de";
     userName = "Thilo Billerbeck";
+    signing.key = "E07F80D7D80BE9D364F2029A77B4535A08DCD774";
+    signing.signByDefault = true;
     extraConfig = {
       color = {
         diff = "auto";
@@ -32,6 +34,9 @@
       branch = {
         autosetuprebase = "always";
       };
+      init = {
+        defaultBranch = "main";
+      };
     };
   };
   programs.git-credential-oauth = {