Refactoring and adding config

flake.nix

@@ -53,10 +53,6 @@
     homeManagerModules = import ./home-modules;
 
     nixosConfigurations = {
-      unikie = inputs.nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = [./hosts/unikie/configuration.nix];
-      };
       x1 = inputs.nixpkgs.lib.nixosSystem {
         inherit specialArgs;
         modules = [./hosts/x1/configuration.nix];

home-modules/common.nix

@@ -26,13 +26,14 @@
     slack
     pavucontrol
     pcmanfm
+    ffmpegthumbnailer # video thumbnails
     obsidian
     gimp
     chromium
     prusa-slicer
+    nsxiv
 
     # cli apps
-    ffmpeg-full
     glow # render markdown on the cli
   ];
 }

home-modules/discord.nix

@@ -1,10 +1,6 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
-    (discord.override {
-      withOpenASAR = true;
-      withVencord = true;
-    })
-  ];
+  home.packages = [pkgs.vesktop];
+
   xdg.configFile = {
     "Vencord/settings/quickCss.css".text = ''
       @import url('https://refact0r.github.io/midnight-discord/midnight.css');

home-modules/neovim.nix

@@ -34,6 +34,16 @@
       undodir = "/home/${user}/.vim/undodir";
     };
 
+    files = {
+      "ftplugin/sh.lua" = {
+        options = {
+          expandtab = true;
+          shiftwidth = 4;
+          tabstop = 4;
+        };
+      };
+    };
+
     colorschemes.dracula.enable = true;
     highlightOverride = {
       Normal.bg = "none";
@@ -206,6 +216,7 @@
         sources = {
           code_actions = {
             statix.enable = true;
+            refactoring.enable = true;
           };
           diagnostics = {
             deadnix.enable = true;
@@ -215,7 +226,15 @@
           formatting = {
             markdownlint.enable = true;
             sqlfluff.enable = true;
-            shfmt.enable = true;
+            shfmt = {
+              enable = true;
+              withArgs = ''
+                { extra_args = {
+                  '-i', '4', '-ci'
+                } }
+              '';
+            };
+            black.enable = true;
             stylua.enable = true;
             terraform_fmt.enable = true;
           };
@@ -258,10 +277,6 @@
             enable = true;
             settings.plugins = {
               pylint.enabled = true;
-              pylsp_mypy = {
-                enabled = true;
-                live_mode = true;
-              };
               isort.enabled = true;
               black.enabled = true;
               ruff.enabled = true;

home-modules/xdg.nix

@@ -1,4 +1,8 @@
-{user, ...}: {
+{
+  user,
+  pkgs,
+  ...
+}: {
   xdg = {
     enable = true;
     userDirs = {
@@ -18,5 +22,11 @@
       exec = ''add-torrent %u'';
       mimeType = ["x-scheme-handler/magnet"];
     };
+
+    desktopEntries."nsxiv" = {
+      name = "nsxiv";
+      exec = ''${pkgs.nsxiv}/bin/nsxiv -a %F'';
+      mimeType = ["image/gif"];
+    };
   };
 }

hosts/hetzner/configuration.nix

@@ -11,10 +11,11 @@
     (modulesPath + "/profiles/qemu-guest.nix")
     (with outputs.nixosModules; [
       common
-      syncthing
-      ssh-access
       docker
       nginx
+      ssh-access
+      syncthing
+      users
     ])
     inputs.disko.nixosModules.disko
     ./disk-config.nix
@@ -32,7 +33,6 @@
   };
 
   security.sudo.wheelNeedsPassword = false;
-  networking.hostName = "hetzner";
 
   systemd.network = {
     enable = true;
@@ -42,9 +42,14 @@
     };
   };
 
+  networking = {
+    hostName = "hetzner";
+    useNetworkd = true;
+  };
+
   environment.systemPackages = with pkgs; [
-    neovim
     git
+    neovim
     busybox
   ];
 

hosts/x1/configuration.nix

@@ -7,16 +7,20 @@
 }: {
   imports = lib.flatten [
     (with outputs.nixosModules; [
+      bin
+      bluetooth
+      bootloader
       common
-      syncthing
       docker
-      bootloader
-      laptop
-      bluetooth
+      fonts
       gui
-      work-vpn
       keyd
-      bin
+      laptop
+      networking
+      sound
+      syncthing
+      users
+      work-vpn
     ])
     (with inputs.nixos-hardware.nixosModules; [
       lenovo-thinkpad-x1-11th-gen
@@ -30,6 +34,15 @@
     hostId = "c08d7d71";
   };
 
+  hardware = {
+    opengl = {
+      extraPackages = with pkgs; [
+        intel-compute-runtime
+        intel-media-driver
+      ];
+    };
+  };
+
   services = {
     syncthing = {
       settings.folders = {

hosts/x1/hardware-configuration.nix

@@ -10,7 +10,7 @@
 
   boot = {
     initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
-    initrd.kernelModules = [];
+    initrd.kernelModules = ["i915"];
     kernelModules = ["kvm-intel"];
     extraModulePackages = [];
   };

hosts/zeus/configuration.nix

@@ -2,20 +2,25 @@
   inputs,
   outputs,
   lib,
-  pkgs,
   ...
 }: {
   imports = lib.flatten [
     (with outputs.nixosModules; [
+      bin
+      bluetooth
+      bootloader
       common
-      syncthing
       docker
-      bootloader
-      bluetooth
+      fonts
+      gaming
       gui
-      work-vpn
       keyd
-      bin
+      networking
+      sound
+      syncthing
+      transmission
+      users
+      work-vpn
     ])
     (with inputs.nixos-hardware.nixosModules; [
       common-cpu-amd
@@ -46,7 +51,7 @@
         "work".enable = true;
       };
     };
-  }; 
+  };
 
   services.xserver = {
     videoDrivers = ["amdgpu"];

modules/bluetooth.nix

@@ -1,10 +1,13 @@
-{
+{pkgs, ...}: {
   hardware = {
     bluetooth = {
       enable = true;
+      package = pkgs.bluez5-experimental;
       powerOnBoot = false;
       settings.General = {
         Enable = "Source,Sink,Media,Socket";
+        Experimental = true;
+        FastConnectable = true;
       };
     };
   };

modules/bootloader.nix

@@ -1,7 +1,10 @@
 {
   boot = {
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 5;
+      };
       efi.canTouchEfiVariables = true;
     };
   };