update system

switch to fv43u
2025-12-11 02:56:27 +00:00 · 2024-08-14 19:37:00 +02:00 · 2024-08-09 11:48:50 +02:00
14 changed files with 295 additions and 109 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -24,22 +24,17 @@
    },
    "devshell": {
      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1721902368,
-        "narHash": "sha256-noQ5SghRPe0jzQEbFQb3fYbV6LZEzr7lIRQoxlU7fyI=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "cf8c7405479cfde7ea4dc815e195391d2328df10",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@@ -107,11 +102,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@@ -155,11 +150,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721042469,
-        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "lastModified": 1723202784,
+        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
        "type": "github"
      },
      "original": {
@@ -197,11 +192,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722119539,
-        "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@@ -218,11 +213,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721852138,
-        "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@@ -259,11 +254,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721719500,
-        "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=",
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
        "type": "github"
      },
      "original": {
@@ -278,14 +273,15 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable",
+        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1721160462,
-        "narHash": "sha256-/VxDWswjySr3CUuMRP4OBBP3sFSps7r1Bh/AJkZSdVk=",
+        "lastModified": 1723599342,
+        "narHash": "sha256-4eUNZxze/tMkKzfAJSS+o3o4LcMH1znWfCUICO/Sw4A=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
-        "rev": "b2d62f3b793495c1156cba6a99512cd95ac2c439",
+        "rev": "5e861c29989be12691f90bda3a7b97891a629ed3",
        "type": "github"
      },
      "original": {
@@ -312,11 +308,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1720954236,
-        "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
+        "lastModified": 1723556749,
+        "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
+        "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
        "type": "github"
      },
      "original": {
@@ -328,11 +324,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1722062969,
-        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
+        "lastModified": 1723362943,
+        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
+        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
        "type": "github"
      },
      "original": {
@@ -357,11 +353,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1722111246,
-        "narHash": "sha256-5ikGEPb8oqup5tTWpvmC8V/ts9ss0VXsPNtlbz7IAYU=",
+        "lastModified": 1723634417,
+        "narHash": "sha256-5M5fjJn02iOZN5z3zM/95l28kC0zjKCkId5JJ9J63fE=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "59941a5300b1b13d6aac0a5115c8fc5b955b5405",
+        "rev": "cb398ce4ba243c7a3a8d1fbfea1b56a44de6b3c9",
        "type": "github"
      },
      "original": {
@@ -372,11 +368,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1722160055,
-        "narHash": "sha256-QPRXResT2+lIWwAXu3wlIEEEp8DhVaMp3eKcLD9HF/g=",
+        "lastModified": 1723654016,
+        "narHash": "sha256-w+YnUCKO+PmG7Y59X5GWDiC4xhYtK0RWSH0wHzBJLFs=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "f33acd7a4aebb1d84612ded3fe5ed0bf1d840c60",
+        "rev": "0feedaeb18733b83f137961463af71d90c452440",
        "type": "github"
      },
      "original": {
@@ -394,11 +390,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721548975,
-        "narHash": "sha256-agCbztdk1f7nCUz03R6xdbivuBRuqubP2RHW+MNuRTg=",
+        "lastModified": 1723367906,
+        "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "551b031e2bc0bcc9584347a8da6312e57169661d",
+        "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
        "type": "github"
      },
      "original": {
@@ -418,6 +414,27 @@
        "nur": "nur"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723515680,
+        "narHash": "sha256-nHdKymsHCVIh0Wdm4MvSgxcTTg34FJIYHRQkQYaSuvk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "4ee3d9e9569f70d7bb40f28804d6fe950c81eab3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1689347949,
@@ -471,11 +488,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721769617,
-        "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
+        "lastModified": 1723454642,
+        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
+        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
        "type": "github"
      },
      "original": {
--- a/hosts/MONSTER/default.nix
+++ b/hosts/MONSTER/default.nix
@@ -62,7 +62,7 @@
    amdgpu.preset.default.enable = true;
    audio.preset.pipewire.enable = true;
    cc1.enable = true;
-    q3279vwf.enable = true;
+    fv43u.enable = true;
    virtual-camera.enable = true;
    hid-fanatecff.enable = true;

--- a/modules/home-manager/programs/nixvim/presets/auto-format.nix
+++ b/modules/home-manager/programs/nixvim/presets/auto-format.nix
@@ -47,13 +47,23 @@ in
    ];

    plugins = {
-      which-key.registrations = {
-        "<leader>a" = {
-          name = "Auto Actions";
-          f = "Toggle auto-format";
-          F = "Toggle auto-format (buffer)";
-        };
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>a";
+          group = "Auto Actions";
+          icon = "󰁨";
+        }
+        {
+          __unkeyed-1 = "<leader>af";
+          desc = "Tggle auto-format";
+          icon = "󱌓";
+        }
+        {
+          __unkeyed-1 = "<leader>aF";
+          desc = "Tggle auto-format (buffer)";
+          icon = "󱌓";
+        }
+      ];

      conform-nvim.formatAfterSave = # lua
        ''
--- a/modules/home-manager/programs/nixvim/presets/auto-save.nix
+++ b/modules/home-manager/programs/nixvim/presets/auto-save.nix
@@ -78,16 +78,28 @@ in
    ];

    plugins = {
-      which-key.registrations = {
-        "<leader>a" = {
-          name = "Auto Actions";
-          s = "Toggle auto-save";
-          S = "Toggle auto-save (buffer)";
-        };
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>a";
+          group = "Auto Actions";
+          icon = "󰁨";
+        }
+        {
+          __unkeyed-1 = "<leader>as";
+          desc = "Tggle auto-save";
+          icon = "󱙃";
+        }
+        {
+          __unkeyed-1 = "<leader>aS";
+          desc = "Tggle auto-save (buffer)";
+          icon = "󱙃";
+        }
+      ];

-      /*neo-tree.eventHandlers.window_before_open = # lua
-        "function() PerformAutoSave() end";*/
+      /*
+        neo-tree.eventHandlers.window_before_open = # lua
+        "function() PerformAutoSave() end";
+      */

      lualine.sections.lualine_x = lib.mkOrder 700 [
        # lua
--- a/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
@@ -85,20 +85,68 @@ in
        };
      };
      inc-rename.enable = true;
-      which-key.registrations."<leader>s" = {
-        name = "LSP";
-        n = "Hover";
-        r = "References";
-        c = "Incremental Rename";
-        R = "Restart LSP";
-        d = "Definitions";
-        i = "Implementations";
-        w = "Workspace Symbols";
-        t = "Type Definitions";
-        h = "Diagnostics";
-        a = "Code Actions";
-        x = "LSP Format";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>s";
+          group = "LSP";
+          icon = "󱐋";
+        }
+        {
+          __unkeyed-1 = "<leader>sn";
+          desc = "Hover";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "<leader>sr";
+          desc = "References";
+          icon = "󱁉";
+        }
+        {
+          __unkeyed-1 = "<leader>sc";
+          desc = "Incremental Rename";
+          icon = "󰑕";
+        }
+        {
+          __unkeyed-1 = "<leader>sR";
+          desc = "Restart LSP";
+          icon = "󰜉";
+        }
+        {
+          __unkeyed-1 = "<leader>sd";
+          desc = "Definitions";
+          icon = "󰜬";
+        }
+        {
+          __unkeyed-1 = "<leader>si";
+          desc = "Implementations";
+          icon = "󰴽";
+        }
+        {
+          __unkeyed-1 = "<leader>sw";
+          desc = "Workspace Symbols";
+          icon = "󰷐";
+        }
+        {
+          __unkeyed-1 = "<leader>st";
+          desc = "Type Definitions";
+          icon = "󱍕";
+        }
+        {
+          __unkeyed-1 = "<leader>sh";
+          icon = "󱖫";
+          desc = "Diagnostics";
+        }
+        {
+          __unkeyed-1 = "<leader>sa";
+          desc = "Code Actions";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "<leader>sx";
+          desc = "LSP Format";
+          icon = "󰉢";
+        }
+      ];
    };
    extraPlugins = [ pkgs.vimPlugins.actions-preview-nvim ];
  };
--- a/modules/home-manager/programs/nixvim/presets/base/find.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/find.nix
@@ -18,13 +18,33 @@ in
          "<leader>fb" = "buffers";
        };
      };
-      which-key.registrations."<leader>f" = {
-        name = "Find";
-        f = "File";
-        a = "Untracked Files";
-        g = "Grep";
-        b = "Buffer";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>f";
+          group = "Find";
+          icon = "󰍉";
+        }
+        {
+          __unkeyed-1 = "<leader>ff";
+          desc = "File";
+          icon = "󰈢";
+        }
+        {
+          __unkeyed-1 = "<leader>fa";
+          desc = "Untracked Files";
+          icon = "󱪡";
+        }
+        {
+          __unkeyed-1 = "<leader>fg";
+          desc = "Grep";
+          icon = "󰑑";
+        }
+        {
+          __unkeyed-1 = "<leader>fb";
+          desc = "Buffer";
+          icon = "󰈙";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/base/status-line.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/status-line.nix
@@ -19,7 +19,13 @@ in
        keymaps."<leader>n" = # vim
          "notify";
      };
-      which-key.registrations."<leader>n" = "Notifications";
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>n";
+          desc = "Notifications";
+          icon = "󰍩";
+        }
+      ];
      lualine = {
        enable = true;
        globalstatus = true;
--- a/modules/home-manager/programs/nixvim/presets/base/tree.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/tree.nix
@@ -35,10 +35,18 @@ in
            end
          '';
      };
-      which-key.registrations = {
-        "<leader>f".t = "Tree";
-        "<leader>s".s = "Document Symbols";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>ft";
+          desc = "Tree";
+          icon = "󰙅";
+        }
+        {
+          __unkeyed-1 = "<leader>ss";
+          desc = "Document Symbols";
+          icon = "󱏒";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/harpoon.nix
+++ b/modules/home-manager/programs/nixvim/presets/harpoon.nix
@@ -26,13 +26,33 @@ in
          navPrev = "hp";
        };
      };
-      which-key.registrations.h = {
-        name = "Harpoon";
-        h = "Marks";
-        m = "Mark";
-        n = "Next";
-        p = "Prev";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "h";
+          group = "Harpoon";
+          icon = "󱀺";
+        }
+        {
+          __unkeyed-1 = "hh";
+          desc = "Marks";
+          icon = "󰈢";
+        }
+        {
+          __unkeyed-1 = "hm";
+          desc = "Add File";
+          icon = "󱪝";
+        }
+        {
+          __unkeyed-1 = "hn";
+          desc = "Next";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "hp";
+          desc = "Prev";
+          icon = "";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/lazygit.nix
+++ b/modules/home-manager/programs/nixvim/presets/lazygit.nix
@@ -67,7 +67,13 @@ in
        };
      };

-      which-key.registrations.${cfg.toggleBind} = "Git";
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = cfg.toggleBind;
+          desc = "Git";
+          icon = "";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/remaps/paste-keep-buffer.nix
+++ b/modules/home-manager/programs/nixvim/presets/remaps/paste-keep-buffer.nix
@@ -21,7 +21,13 @@ in
    ];
    plugins.which-key = {
      enable = true;
-      registrations."<leader>p" = "Paste Keep Buffer";
+      settings.spec = [
+        {
+          __unkeyed-1 = "<leader>p";
+          desc = "Paste Keep Buffer";
+          icon = "";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/trouble.nix
+++ b/modules/home-manager/programs/nixvim/presets/trouble.nix
@@ -45,14 +45,41 @@ in
        enable = true;
        settings.use_diagnostic_signs = true;
      };
-      which-key.registrations."<leader>x" = {
-        name = "Trouble";
-        x = "Toggle";
-        w = "Workspace Diagnostics";
-        d = "Document Diagnostics";
-        q = "Quickfix";
-        l = "Loclist";
-      };
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>x";
+          group = "Trouble";
+          icon = {
+            icon = "";
+            color = "red";
+          };
+        }
+        {
+          __unkeyed-1 = "<leader>xx";
+          desc = "Toggle";
+          icon = "󰺲";
+        }
+        {
+          __unkeyed-1 = "<leader>xw";
+          desc = "Workspace Diagnostics";
+          icon = "󰙅";
+        }
+        {
+          __unkeyed-1 = "<leader>xd";
+          desc = "Document Diagnostics";
+          icon = "󱪗";
+        }
+        {
+          __unkeyed-1 = "<leader>xq";
+          desc = "Quickfix";
+          icon = "";
+        }
+        {
+          __unkeyed-1 = "<leader>xl";
+          desc = "Loclist";
+          icon = "󰷐";
+        }
+      ];
    };
  };
 }
--- a/modules/home-manager/programs/nixvim/presets/undotree.nix
+++ b/modules/home-manager/programs/nixvim/presets/undotree.nix
@@ -22,7 +22,13 @@ in
    ];
    plugins = {
      undotree.enable = true;
-      which-key.registrations."<leader>u" = "Undotree";
+      which-key.settings.spec = [
+        {
+          __unkeyed-1 = "<leader>u";
+          desc = "Undotree";
+          icon = "󰕌";
+        }
+      ];
    };
  };
 }
--- a/modules/nixos/hardware/fv43u.nix
+++ b/modules/nixos/hardware/fv43u.nix
@@ -17,7 +17,7 @@ in
  config = mkIf cfg.enable {
    fonts.fontconfig.subpixel.rgba = "bgr";
    hardware.gbmonctl.enable = true;
-    boot.kernelParams = [ "video=3840x2160@144" ];
+    boot.kernelParams = [ "video=3840x2160@120" ];

    home-manager.users.${username}.wayland.windowManager.hyprland.settings = {
      general.layout = "master";
@@ -27,8 +27,8 @@ in
        mfact = 0.4;
      };
      monitor = [
-        "DP-1,highrr,0x0,1"
-        "DP-1,addreserved,340,0,0,0"
+        "DP-3,3840x2160@120,0x0,1,bitdepth,10"
+        "DP-3,addreserved,340,0,0,0"
      ];
      xwayland.force_zero_scaling = true;
      misc.vrr = 2; # VA suffers from VRR flicker
Author	SHA1	Message	Date
Thea Schöbl	a060be6995	update system	2024-08-14 19:37:00 +02:00
Thea Schöbl	ac1773445f	switch to fv43u	2024-08-09 11:48:50 +02:00