git, ssh, waybar nordvpn, firefox no plugins

.gitignore

@@ -0,0 +1 @@
+flake.lock

home/default.nix

@@ -10,6 +10,7 @@ in {
     ./zsh.nix
     ./rofi.nix
     ./libinput.nix
+    ./git-ssh.nix
   ];
 
   fonts.fontconfig.enable = true;

home/firefox.nix

@@ -118,9 +118,9 @@ in{
           "app.normandy.api_url" = "";
         };
 
-        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+        # extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin bitwarden rust-search-extension betterttv
+        #   ublock-origin bitwarden rust-search-extension betterttv
-        ];
+        # ];
       };
     };
   };

home/git-ssh.nix

@@ -0,0 +1,46 @@
+{pkgs, ...}: {
+  programs.git = {
+	  enable = true;
+	  userName = "janis";
+	  userEmail = "janis@nirgendwo.xyz";
+  };
+
+  programs.ssh = {
+    addKeysToAgent = "yes";
+    enable = true;
+    matchBlocks = {
+      "git.nirgendwo.xyz" = {
+        host = "git.nirgendwo.xyz";
+        hostname = "git.nirgendwo.xyz";
+        identityFile = "~/.ssh/id_ed25519_nirgendwo";
+      };
+      "nirgendwo.xyz" = {
+        host = "nirgendwo.xyz";
+        hostname = "nirgendwo.xyz";
+        identityFile = "~/.ssh/id_ed25519_nirgendwo";
+      };
+      "nirgendswo.com" = {
+        host = "nirgendswo.com";
+        hostname = "nirgendswo.com";
+        identityFile = "~/.ssh/id_ed25519_nirgendwo";
+      };
+      "nirgendwo" = {
+        host = "nirgendwo";
+        hostname = "nirgendwo.xyz";
+        user = "root";
+        identityFile = "~/.ssh/id_ed25519_nirgendwo";
+      };
+      "github.com:janis-bhm" = {
+        host = "github.com:janis-bhm";
+        hostname = "github.com";
+        identityFile = "~/.ssh/duralumin_janis-github";
+      };
+      "noonebtw.github.com" = {
+        host = "noonebtw.github.com";
+        hostname = "github.com";
+        identityFile = "~/.ssh/id_ed25519_git";
+      };
+    };
+  };
+  services.ssh-agent.enable = true;
+}

home/waybar.nix

@@ -42,22 +42,22 @@ SSID: {essid} {frequency}'';
         };
         background = theme.normal.green;
       }
-      # {
+      {
-      #   name = "custom/vpn";
+        name = "custom/vpn";
-      #   config = {
+        config = {
-      #     format = "{}";
+          format = "{}";
-      #     excape = true;
+          excape = true;
-      #     interval = 30;
+          interval = 30;
-      #     exec = "${pkgs.nordvpn-rofi}/bin/nordvpn-rofi --status-json";
+          exec = "${pkgs.nordvpn-rofi}/bin/nordvpn-rofi --status-json";
-      #     return-type = "json";
+          return-type = "json";
-      #     on-click = "rofi -show vpn -modes 'vpn:nordvpn-rofi'";
+          on-click = "rofi -show vpn -modes 'vpn:nordvpn-rofi'";
-      #   };
+        };
-      #   style = {
+        style = {
-      #     connected.color = theme.normal.black;
+          connected.color = theme.normal.black;
-      #     disconnected.color = theme.normal.yellow;
+          disconnected.color = theme.normal.yellow;
-      #   };
+        };
-      #   background = theme.extra.teal;
+        background = theme.extra.teal;
-      # }
+      }
     ]
     ++ (if (super-config.has_battery) then [{
       name = "battery";

hosts/laptop/default.nix

@@ -8,7 +8,7 @@
   has_battery = true;
   desktop_scale = 1.3;
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];