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

home-manager/modules/polybar/default.nix

@@ -121,7 +121,7 @@ in
           ];
 
           modules = {
-            left = "launcher workspaces playerctl";
+            left = "workspaces playerctl";
             center = "date";
             right = "headset-battery memory cpu pulseaudio network";
           };
@@ -162,68 +162,29 @@ in
           pseudo.transparency = false;
         };
 
-        "module/launcher" = {
-          type = "custom/text";
-          content.text = "";
-          content.padding = 2;
-
-          click.left = "${pkgs.rofi}/bin/rofi -show drun -no-lazy-grab";
-        };
-
         "module/workspaces" = {
-          # type = "internal/xworkspaces";
-          # pin.workspaces = true;
-          # enable.click = true;
-          # enable.scroll = true;
-
-          # icon.text = [ "1;" "2;" "3;" "4;" "5;" ];
-          # icon.default = "";
-
-          # format.text = "<label-state>";
-          # format.padding = 1;
-
-          # label.active.text = "";
-          # label.occupied.text = "";
-          # label.empty.text = "";
-
-          # label.urgent.text = "";
-          # label.urgent.background = "${colors.urgent}";
-
-          # label.active.padding = 1;
-          # label.urgent.padding = 1;
-          # label.occupied.padding = 1;
-          # label.empty.padding = 1;
-
           type = "internal/i3";
           pin.workspaces = true;
           strip.wsnumbers = true;
           enable.click = true;
           enable.scroll = true;
 
-          # ws.icon.text = [ "1;" "2;" "3;" "4;" "5;" "6;" "7;" "8;" "9;" "10;" ];
-          # ws.icon.text = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "10" ];
-          # ws.icon.default = "";
-
           format = "<label-state> <label-mode>";
 
           label.mode.text = "%mode%";
           label.mode.padding = 1;
 
-          # label.focused.text = "";
           label.focused.text = "%index%";
           label.focused.padding = 1;
           label.focused.background = "#333333";
           label.focused.underline = "#ffffff";
 
-          # label.unfocused.text = "";
           label.unfocused.text = "%index%";
           label.unfocused.padding = 1;
 
-          # label.visible.text = "";
           label.visible.text = "%index%";
           label.visible.padding = 1;
 
-          # label.urgent.text = "";
           label.urgent.text = "%index%";
           label.urgent.background = "${colors.urgent}";
           label.urgent.padding = 1;

machines/mimir/hardware-configuration.nix

@@ -32,7 +32,8 @@
   powerManagement.cpuFreqGovernor = "ondemand";
 
   hardware = {
-    video.hidpi.enable = true;
+    # Renamed to fonts.optimizeForVeryHighDPI
+    # video.hidpi.enable = true;
     enableAllFirmware = true;
     nvidia = {
       modesetting.enable = true;

users/erwin/work.nix

@@ -113,6 +113,7 @@ in
         minio-client
         mpv
         nordzy-cursor-theme
+        nushell
         pamedia
         quintom-cursor-theme
         procs
@@ -126,6 +127,7 @@ in
         unzip
         xdg-utils
         xkb-switch
+        wine
         zathura
         zeal
       ]
@@ -224,6 +226,7 @@ in
       xkbVariant = "colemak,";
       xkbModel = "pc105";
       xkbOptions = "ctrl:nocaps,eurosign:5,lv5:ralt_switch,lv3:rwin_switch,grp:shifts_toggle";
+      upscaleDefaultCursor = false;
 
       windowManager.i3 = {
         enable = true;