Merge branch 'main' of git.datarift.nl:erwin/nixos-config

home-manager/modules/emacs/default.nix

@@ -5,8 +5,6 @@
 }:
 with lib; let
   cfg = config.eboskma.programs.emacs;
-  emacsX11 = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
-  emacsWayland = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
 
   orgProtocolDesktop = pkgs.makeDesktopItem {
     name = "org-protocol";
@@ -37,7 +35,7 @@ in
     package = mkOption {
       description = "The emacs package to install";
       type = types.package;
-      default = emacsWayland;
+      default = pkgs.emacs;
     };
 
     daemon = mkOption {

home-manager/modules/i3/default.nix

@@ -44,6 +44,8 @@ in
   config = mkIf cfg.enable {
     xsession = {
       enable = true;
+      numlock.enable = true;
+
       windowManager.i3 = {
         enable = true;
         package = pkgs.i3-gaps;
@@ -249,16 +251,16 @@ in
               command = "${pkgs.networkmanagerapplet}/bin/nm-applet";
               notification = false;
             }
-            {
+            # {
-              command = ''${pkgs.xorg.xinput}/bin/xinput set-int-prop "Logitech USB Laser Mouse" "libinput Natural Scrolling Enabled" 8 1'';
+            #   command = ''${pkgs.xorg.xinput}/bin/xinput set-int-prop "Logitech USB Laser Mouse" "libinput Natural Scrolling Enabled" 8 1'';
-              notification = false;
+            #   notification = false;
-              always = true;
+            #   always = true;
-            }
+            # }
-            {
+            # {
-              command = ''${pkgs.xorg.xinput}/bin/xinput set-float-prop "Logitech USB Laser Mouse" "libinput Accel Speed" 1'';
+            #   command = ''${pkgs.xorg.xinput}/bin/xinput set-float-prop "Logitech USB Laser Mouse" "libinput Accel Speed" 1'';
-              notification = false;
+            #   notification = false;
-              always = true;
+            #   always = true;
-            }
+            # }
             {
               command = "${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --left-of DP-4";
               notification = false;

home-manager/modules/mpd/default.nix

@@ -21,5 +21,7 @@ in
       enable = true;
       notifications = true;
     };
+
+    home.packages = with pkgs; [ mpc-cli ];
   };
 }

home-manager/modules/zellij/default.nix

@@ -4,14 +4,21 @@ let
   cfg = config.eboskma.programs.zellij;
 in
 {
-  options.eboskma.programs.zellij = { enable = mkEnableOption "zellij"; };
+  options.eboskma.programs.zellij = {
+    enable = mkEnableOption "zellij";
+    copyCommand = mkOption {
+      description = "Command used to copy a selection";
+      type = types.str;
+      example = literalExpression ''"''${pkgs.wl-clipboard}/bin/wl-copy"'';
+    };
+  };
 
   config = mkIf (cfg.enable) {
     programs.zellij = {
       enable = true;
       settings = {
         theme = "dracula";
-        copy_command = "${pkgs.wl-clipboard}/bin/wl-copy";
+        copy_command = cfg.copyCommand;
         scrollback_editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient";
         pane_frames = false;
 

machines/mimir/configuration.nix

@@ -3,9 +3,7 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { self, nixpkgs, nixos-hardware, ... }:
-let
+{ pkgs, ... }:
-  pkgs = nixpkgs.legacyPackages.x86_64-linux;
-in
 {
   imports =
     [
@@ -87,10 +85,11 @@ in
   systemd.network = {
     enable = true;
 
-    wait-online.anyInterface = true;
+    wait-online.extraArgs = [ "--interface=enp4s0" ];
 
     networks = {
       "40-enp4s0" = {
+        enable = true;
         DHCP = "yes";
 
         matchConfig = {
@@ -99,8 +98,9 @@ in
       };
 
       "40-enp5s0f1" = {
+        enable = true;
         linkConfig = {
-          RequiredForOnline = false;
+          RequiredForOnline = "no";
         };
         matchConfig = {
           Name = "enp5s0f1";
@@ -112,6 +112,14 @@ in
   services.openssh.enable = true;
   programs.ssh.startAgent = true;
 
+  services.xserver.libinput = {
+    enable = true;
+    mouse = {
+      accelSpeed = "1.0";
+      naturalScrolling = true;
+    };
+  };
+
   # sops = {
   #   defaultSopsFile = ./secrets.yaml;
 

machines/mimir/hardware-configuration.nix

@@ -14,26 +14,28 @@
     options amd-pstate shared_mem=true
   '';
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-label/nixos";
-      device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
-  fileSystems."/boot/efi" =
+  fileSystems."/boot" = {
-    {
+    device = "/dev/disk/by-label/boot";
-      device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
-      fsType = "vfat";
+  };
-    };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    {
+    device = "/dev/disk/by-label/home";
-      device = "/dev/disk/by-label/home";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
+
+  fileSystems."/yocto" = {
+    device = "/dev/disk/by-label/yocto";
+    fsType = "ext4";
+  };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/82969dda-8804-4314-b916-2d4b5db904d5"; }];
+    [{ device = "/dev/disk/by-label/swap"; }];
 
   powerManagement.cpuFreqGovernor = "ondemand";
   hardware = {

modules/desktop/default.nix

@@ -92,7 +92,7 @@ in
     };
 
     environment = {
-      sessionVariables = {
+      sessionVariables = mkIf cfg.wayland {
         _JAVA_AWT_WM_NONREPARENTING = "1";
         MOZ_ENABLE_WAYLAND = "1";
         MOZ_DBUS_REMOTE = "1";

users/erwin/home.nix

@@ -47,6 +47,7 @@ in
             dunst.enable = false;
             emacs = {
               enable = true;
+              package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
               daemon = true;
             };
             electron = {
@@ -114,7 +115,10 @@ in
             tmux.enable = true;
             waybar.enable = true;
             zathura.enable = true;
-            zellij.enable = true;
+            zellij = {
+              enable = true;
+              copyCommand = "${pkgs.wl-clipboard}/bin/wl-copy";
+            };
           };
         };
 

users/erwin/work.nix

@@ -32,6 +32,7 @@ in
           dunst.enable = true;
           emacs = {
             enable = true;
+            package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
             daemon = true;
           };
           firefox = {
@@ -68,7 +69,10 @@ in
           };
           rofi.enable = true;
           ssh.enable = true;
-          zellij.enable = true;
+          zellij = {
+            enable = true;
+            copyCommand = "${pkgs.xsel}/bin/xsel --clipboard";
+          };
         };
         services = {
           xbanish.enable = true;