Add desktop config and restructure bin

flake.nix

@@ -42,29 +42,30 @@
     bin,
   } @ inputs: let
     inherit (self) outputs;
+    specialArgs = {inherit inputs outputs;};
   in {
     nixosModules = import ./modules;
     homeManagerModules = import ./home-modules;
 
     nixosConfigurations = {
       buutti = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+        inherit specialArgs;
         modules = [./hosts/buutti/configuration.nix];
       };
       unikie = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+        inherit specialArgs;
         modules = [./hosts/unikie/configuration.nix];
       };
       x1 = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+        inherit specialArgs;
         modules = [./hosts/x1/configuration.nix];
       };
       zeus = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+        inherit specialArgs;
         modules = [./hosts/zeus/configuration.nix];
       };
       hetzner = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+        inherit specialArgs;
         modules = [./hosts/hetzner/configuration.nix];
       };
     };

home-modules/imv.nix

@@ -8,7 +8,7 @@
         overlay_position_bottom = true;
       };
       binds = {
-        "w" = "exec setbg $imv_current_file";
+        "w" = ''exec setbg "$imv_current_file"'';
         "<comma>" = "prev_frame";
       };
     };

home-modules/zsh.nix

@@ -45,6 +45,7 @@
         --os-format "{3} {12}" \
         --memory-format "{/1}{-}{/}{/2}{-}{/}{} / {}"
       '';
+      copy = "xclip -selection clipboard";
     };
 
     envExtra = ''

hosts/buutti/configuration.nix

@@ -7,6 +7,7 @@
   ...
 }: let
   user = "joonas";
+  system = "x86_64-linux";
 in {
   imports = lib.flatten [
     (with outputs.nixosModules; [
@@ -17,6 +18,7 @@ in {
       bluetooth
       gui
       work-vpn
+      (bin {inherit inputs system;})
     ])
     (with inputs.nixos-hardware.nixosModules; [
       common-cpu-amd
@@ -106,6 +108,5 @@ in {
         libnotify
       ]
     )
-    inputs.bin.all
   ];
 }

hosts/unikie/configuration.nix

@@ -15,6 +15,7 @@ in {
       bluetooth
       gui
       work-vpn
+      (bin {inherit inputs system;})
     ])
     ./hardware-configuration.nix
   ];

hosts/x1/configuration.nix

@@ -7,6 +7,7 @@
   ...
 }: let
   user = "joonas";
+  system = "x86_64-linux";
 in {
   imports = lib.flatten [
     (with outputs.nixosModules; [
@@ -19,6 +20,7 @@ in {
       work-vpn
       keyd
       trackpoint
+      (bin {inherit inputs system;})
     ])
     (with inputs.nixos-hardware.nixosModules; [
       lenovo-thinkpad-x1-11th-gen
@@ -112,6 +114,5 @@ in {
         libnotify
       ]
     )
-    inputs.bin.all
   ];
 }

hosts/zeus/configuration.nix

@@ -7,6 +7,7 @@
   ...
 }: let
   user = "joonas";
+  system = "x86_64-linux";
 in {
   imports = lib.flatten [
     (with outputs.nixosModules; [
@@ -17,10 +18,15 @@ in {
       gui
       work-vpn
       keyd
+      (bin {inherit inputs system;})
     ])
-    # (with inputs.nixos-hardware.nixosModules; [
-    # ])
-    (import ./home.nix {inherit inputs outputs pkgs user;})
+    (with inputs.nixos-hardware.nixosModules; [
+      common-cpu-amd
+      common-gpu-amd
+      common-pc-ssd
+      common-pc
+    ])
+    (import ./home.nix {inherit inputs outputs pkgs user lib;})
     ./hardware-configuration.nix
   ];
 
@@ -40,13 +46,63 @@ in {
     syncthing = {
       settings.folders = {
         "code".enable = true;
-        # "notes".enable = true;
-        # "pictures".enable = true;
-        # "work".enable = true;
+        "notes".enable = true;
+        "pictures".enable = true;
+        "work".enable = true;
       };
     };
   };
 
+  # Enable firmware update
+  services.fwupd.enable = true;
+
+  # better for steam proton games
+  systemd.extraConfig = "DefaultLimitNOFILE=1048576";
+
+  programs.gamemode.enable = true;
+
+  # Add opengl/vulkan support
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+    extraPackages = with pkgs; [
+      libva
+    ];
+  };
+
+  hardware.pulseaudio.daemon.config = {
+    default-sample-format = "float32le";
+  };
+
+  services.xserver = {
+    imwheel = {
+      enable = true;
+      rules = {
+        "^discord$" = ''
+          None, Up, Button4, 3
+          None, Down, Button5, 3
+        '';
+      };
+    };
+
+    libinput = {
+      enable = true;
+      mouse.accelProfile = "flat";
+    };
+
+    xrandrHeads = [
+      {
+        output = "DP-1";
+        primary = true;
+        monitorConfig = ''
+          Modeline "3440x1440_144.00"  1086.75  3440 3744 4128 4816  1440 1443 1453 1568 -hsync +vsync
+          Option "PreferredMode" "3440x1440_144.00"
+        '';
+      }
+    ];
+  };
+
   environment.systemPackages = lib.flatten [
     (
       with pkgs; [
@@ -89,11 +145,13 @@ in {
         rsync
         glow # render markdown on the cli
         xclip
+        pciutils
+        usbutils
+        vulkan-tools
 
         # libs
         libnotify
       ]
     )
-    inputs.bin.all
   ];
 }

hosts/zeus/hardware-configuration.nix

@@ -0,0 +1,43 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = ["amdgpu"];
+  boot.kernelModules = ["kvm-amd"];
+  boot.extraModulePackages = [];
+
+  fileSystems = {
+    "/" = {
+      device = "tank/root";
+      fsType = "zfs";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/8386-EB84";
+      fsType = "vfat";
+    };
+  };
+
+  swapDevices = [];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}