Generic commit

modules/sound: added jack and other stuff
satori: kernel and pkg changes
home/xmonad: some keybind changes
emacs: some more configuration updates, this took me quite some time to configure but i dont see myself using it at all since neovim is still much much more efficient for me

hosts/satori/boot.nix

@@ -2,7 +2,7 @@
 
 {
   boot = {
-    kernelPackages = pkgs.unstable.linuxPackages_latest;
+    kernelPackages = pkgs.unstable.linuxPackages_zen;
     initrd={
       availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
  /*     preDeviceCommands = ''
@@ -15,7 +15,7 @@
       kernelModules = [];
     };
     kernelParams = [ "intel_pstate=active" "intel_iommu=on" ]; 
-    kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" ];
+    kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" "joydev" ];
     extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback];
     loader = {
       efi = {

hosts/satori/hardware.nix

@@ -29,6 +29,7 @@
       fsType = "btrfs";
       options = [ "compress-force=zstd:3" ];
     };
+
   swapDevices = [ ];
   zramSwap = {
     enable = true;

hosts/satori/networking.nix

@@ -1,4 +1,4 @@
-{config, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   networking = {
@@ -13,10 +13,10 @@
       enp7s0.useDHCP = true;
       wlp0s20f3 = {
         useDHCP = true;
-        ipv4.addresses = [ {
+        ipv4.addresses = [{
           prefixLength = 24;
           address = "192.168.0.109";
-        } ];
+        }];
       };
     };
     wireguard.interfaces.wg0 = {
@@ -25,11 +25,11 @@
       privateKeyFile = "/var/wg";
       peers = [
         {
-        #Oracle VM1
-        publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
-        allowedIPs = [ "10.55.0.0/24" ];
-        endpoint = "weirdnatto.in:17840";
-        persistentKeepalive = 25;
+          #Oracle VM1
+          publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
+          allowedIPs = [ "10.55.0.0/24" ];
+          endpoint = "weirdnatto.in:17840";
+          persistentKeepalive = 25;
         }
       ];
     };

hosts/satori/pkgs.nix

@@ -2,6 +2,7 @@
 
 {
   environment.systemPackages = with pkgs; [
+    w3m
     tmux
     bc
     gnumake
@@ -11,6 +12,7 @@
     python3
     htop
     nodejs
+    ghc
     wget
     ripgrep
     kbd
@@ -29,10 +31,16 @@
     rnix-lsp
     python3Packages.python-lsp-server
     haskell-language-server
+    fly
+    (steam.override {
+      extraLibraries = pkgs: [ pkgs.pipewire ];
+      extraProfile = ''
+        unset VK_ICD_FILENAMES
+        export VK_ICD_FILENAMES=${config.hardware.nvidia.package}/share/vulkan/icd.d/nvidia_icd.json:${config.hardware.nvidia.package.lib32}/share/vulkan/icd.d/nvidia_icd32.json'';
+    })
   ];
 
   programs = {
-    steam.enable = true;
     gnupg = {
       agent = {
         enableSSHSupport = true;
@@ -104,7 +112,7 @@
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = ''
-      experimental-features = nix-command ca-references flakes
+      experimental-features = nix-command flakes
     '';
     trustedUsers = [ "root" "natto" ];
     binaryCaches = [

hosts/satori/services.nix

@@ -1,7 +1,44 @@
-{lib, config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   services = {
+ /*   openvpn.servers = {
+      satori = {
+        config = ''
+          remote weirdnatto.in
+          dev tun
+          ifconfig 10.55.0.3 10.55.0.1
+          secret /var/secrets/openvpn.key
+        '';
+      };
+    };*/
+    vault-agent = {
+      enable = true;
+      settings = {
+        vault = {
+          address = "https://10.55.0.2:8800";
+          client_cert = "/var/vault/cert.pem";
+          client_key = "/var/vault/key.pem";
+        };
+        auto_auth = {
+          method = [
+            {
+              "cert" = {
+                name = "Satori";
+              };
+            }
+          ];
+        };
+        template = [
+          {
+            source = pkgs.writeText "openvpn.tpl" ''
+              {{ with secret "kv/openvpn" }}{{ .Data.data.secret }}{{ end }}
+            '';
+            destination = "/var/secrets/openvpn.key";
+          }
+        ];
+      };
+    };
     tor.enable = true;
     logmein-hamachi.enable = true;
     openssh = {
@@ -18,18 +55,18 @@
     };
   };
   systemd.services = {
-    tor.wantedBy = lib.mkForce [];
-    mysql.wantedBy = lib.mkForce [];
-    logmein-hamachi.wantedBy = lib.mkForce [];
-    openssh.wantedBy = lib.mkForce [];
+    tor.wantedBy = lib.mkForce [ ];
+    mysql.wantedBy = lib.mkForce [ ];
+    logmein-hamachi.wantedBy = lib.mkForce [ ];
+    openssh.wantedBy = lib.mkForce [ ];
     #printing.wantedBy = lib.mkForce [];
     #vault.wantedBy = lib.mkForce [];
   };
   security.pki.certificateFiles = [ ../../cert.pem ];
- /* virtualisation.libvirtd = {
+  /* virtualisation.libvirtd = {
     enable = true;
     onBoot = "ignore";
     onShutdown = "shutdown";
     qemuRunAsRoot = false;
-  };*/
+    };*/
 }