Home: Update config for new lock

flake.nix

@@ -32,7 +32,7 @@
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     # Secure boot
-    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";
     lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
 
     # Nix User Repository (e.g. Firefox addons)

home/christoph/default.nix

@@ -291,7 +291,7 @@
 
           # Hardware/Software info
           pciutils # lspci
-          glxinfo # OpenGL info
+          mesa-demos # OpenGL info
           wayland-utils # wayland-info
           clinfo # OpenCL info
           vulkan-tools # vulkaninfo
@@ -312,7 +312,7 @@
           spotdl
 
           # Document utils
-          poppler_utils # pdfunite
+          poppler-utils # pdfunite
           graphviz # generate graphs from code
           d2 # generate diagrams from code
           plantuml # generate diagrams
@@ -334,8 +334,6 @@
           cifs-utils # Mount samba shares
           nfs-utils # Mount NFS shares
           sshfs # Mount remote directories via SSH
-          protonvpn-cli_2
-          protonmail-bridge # TODO: Enable on startup, email module
 
           # Run unpatched binaries on NixOS
           # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
@@ -808,21 +806,22 @@
 
   systemd = {
     user = {
-      tmpfiles.rules = lib.mkMerge [
+      # TODO: This has been deprecated and replaced with a bad alternative in a stupid HM update
-        []
+      # tmpfiles.rules = lib.mkMerge [
-        (lib.mkIf (mylib.modules.contains
+      #   []
-          config.services.flatpak.packages
+      #   (lib.mkIf (mylib.modules.contains
-          "com.discordapp.Discord") [
+      #     config.services.flatpak.packages
-          # Fix Discord rich presence for Flatpak
+      #     "com.discordapp.Discord") [
-          "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
+      #     # Fix Discord rich presence for Flatpak
-        ])
+      #     "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
-        (lib.mkIf (mylib.modules.contains
+      #   ])
-          config.services.flatpak.packages
+      #   (lib.mkIf (mylib.modules.contains
-          "com.discordapp.DiscordCanary") [
+      #     config.services.flatpak.packages
-          # Fix Discord rich presence for Flatpak
+      #     "com.discordapp.DiscordCanary") [
-          "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
+      #     # Fix Discord rich presence for Flatpak
-        ])
+      #     "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
-      ];
+      #   ])
+      # ];
 
       # Nicely reload system units when changing configs
       startServices = "sd-switch";

home/modules/1_deprecated/flatpak/default.nix

@@ -81,7 +81,7 @@ with mylib.modules;
             cp -f ${pkgs.lxgw-wenkai}/share/fonts/truetype/LXGWWenKaiMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
             cp -f ${pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
             cp -f ${pkgs.noto-fonts}/share/fonts/noto/NotoSans[wdth,wght].ttf ${config.home.homeDirectory}/.local/share/fonts/
-            cp -f ${pkgs.noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
+            cp -f ${pkgs.noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
           '';
         })
         (mkElse cfg.fontFix {

home/modules/1_deprecated/ranger/default.nix

@@ -33,7 +33,7 @@ in {
           python310Packages.pillow
           ffmpegthumbnailer
           imagemagick
-          poppler_utils
+          poppler-utils
         ])
       ];
 

home/modules/git/default.nix

@@ -11,30 +11,29 @@ in {
   options.modules.git = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf git.enable {
-    programs.git = {
+    programs.diff-so-fancy = {
       enable = true;
+      enableGitIntegration = true;
 
-      # userEmail = "christoph.urlacher@protonmail.com";
+      settings = {
-      # userName = "Christoph Urlacher";
-
-      userEmail = git.userEmail;
-      userName = git.userName;
-
-      signing = {
-        signByDefault = git.signCommits;
-        format = "ssh";
-        key = "~/.ssh/id_ed25519.pub";
-      };
-
-      lfs.enable = true;
-      diff-so-fancy = {
-        enable = true;
         changeHunkIndicators = true;
         markEmptyLines = false;
         stripLeadingSymbols = true;
       };
+    };
+
+    programs.git = {
+      enable = true;
+
+      # settings.user.email = "christoph.urlacher@protonmail.com";
+      # settings.user.name = "Christoph Urlacher";
+
+      settings = {
+        user = {
+          email = git.userEmail;
+          name = git.userName;
+        };
 
-      extraConfig = {
         core = {
           compression = 9;
           # whitespace = "error";
@@ -111,6 +110,14 @@ in {
           };
         };
       };
+
+      signing = {
+        signByDefault = git.signCommits;
+        format = "ssh";
+        key = "~/.ssh/id_ed25519.pub";
+      };
+
+      lfs.enable = true;
     };
   };
 }

home/modules/hyprland/default.nix

@@ -61,7 +61,7 @@ in {
         wl-clipboard
         clipman # Clipboard manager (wl-paste)
         libnotify
-        inotifyTools # Includes inotifywait
+        inotify-tools # Includes inotifywait
 
         ncpamixer # Audio control
         slurp # Region selector for screensharing

home/modules/neovim/default.nix

@@ -820,6 +820,8 @@ in {
           };
 
           # NOTE: This entire thing is rough, I should rewrite...
+          # TODO: Need to rewrite this once lspconfig 3.0 comes around
+          # TODO: LSP servers don't autostart anymore...
           lspconfig = {
             name = "lspconfig";
             pkg = pkgs.vimPlugins.nvim-lspconfig;
@@ -837,14 +839,17 @@ in {
                   extraOptions = {
                     root_dir.__raw = ''
                       function(fname)
-                        return require("lspconfig.util").root_pattern(
+                        -- return require("lspconfig.util").root_pattern(
+                        return vim.lsp.config.util.root_pattern(
                           "Makefile",
                           "CMakeLists.txt",
                           ".clang-format",
                           ".clang-tidy"
-                        )(fname) or require("lspconfig.util").root_pattern(
+                        -- )(fname) or require("lspconfig.util").root_pattern(
+                        )(fname) or vim.lsp.config.util.root_pattern(
                           "compile_commands.json"
-                        )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+                        -- )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+                        )(fname) or vim.lsp.config.util.find_git_ancestor(fname)
                       end
                     '';
 
@@ -941,9 +946,6 @@ in {
               ];
             in ''
               function(_, opts)
-                -- Make LspInfo window border rounded
-                require("lspconfig.ui.windows").default_options.border = "rounded"
-
                 local __lspOnAttach = function(client, bufnr)
 
                   -- NOTE: The ltex-extra package needs to be loaded in ltex's onAttach.
@@ -987,7 +989,8 @@ in {
 
                 for i, server in ipairs(${servers}) do
                   if type(server) == "string" then
-                    require("lspconfig")[server].setup(__setup)
+                    -- require("lspconfig")[server].setup(__setup)
+                    vim.lsp.config(server, __setup)
                   else
                     local options = server.extraOptions
 
@@ -997,7 +1000,8 @@ in {
                       options = vim.tbl_extend("keep", options, __setup)
                     end
 
-                    require("lspconfig")[server.name].setup(options)
+                    -- require("lspconfig")[server.name].setup(options)
+                    vim.lsp.config(server.name, options)
                   end
                 end
               end

home/modules/neovim/mappings.nix

@@ -834,19 +834,19 @@ _: let
     {
       mode = "n";
       key = "<leader>tt";
-      action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
+      action = "<cmd>Trouble diagnostics toggle focus=false win.position=left<cr>";
       options.desc = "Trouble Diagnostics";
     }
     {
       mode = "n";
       key = "<leader>tD";
-      action = "<cmd>Trouble todo toggle focus=false win.position=bottom<cr>";
+      action = "<cmd>Trouble todo toggle focus=false win.position=left<cr>";
       options.desc = "Toggle TODOs";
     }
     {
       mode = "n";
       key = "<leader>ts";
-      action = "<cmd>Trouble symbols toggle focus=false win.position=right<cr>";
+      action = "<cmd>Trouble symbols toggle focus=false win.position=left<cr>";
       options.desc = "Trouble Symbols";
     }
     {

home/modules/neovim/vim_opts.nix

@@ -10,6 +10,7 @@ _: {
   formatexpr = "v:lua.require('conform').formatexpr()";
   laststatus = 3; # Global statusline
   winblend = 30; # Floating popup transparency
+  winborder = "rounded";
   sessionoptions = ["buffers" "curdir" "folds" "globals" "help" "skiprtp" "tabpages" "winsize"]; # What should be saved when creating a session
   showtabline = 2; # Disable tabline with 0, show for > 1 with 1, always show with 2
   conceallevel = 2;

system/modules/fonts/default.nix

@@ -29,7 +29,7 @@ in {
 
         # Sans/Serif fonts
         noto-fonts
-        noto-fonts-emoji
+        noto-fonts-color-emoji
         noto-fonts-cjk-sans
         lxgw-wenkai
       ];

system/nixinator/hardware-configuration.nix

@@ -131,7 +131,7 @@
 
       # https://nixos.wiki/wiki/Accelerated_Video_Playback
       extraPackages = with pkgs; [
-        vaapiVdpau # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
+        libva-vdpau-driver # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
         libvdpau-va-gl # Taken from wiki
 
         # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/3

system/nixtop/hardware-configuration.nix

@@ -71,8 +71,8 @@
       # driSupport = true; # NOTE: Deprecated
       extraPackages = with pkgs; [
         intel-media-driver
-        vaapiIntel
+        intel-vaapi-driver
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
       ];
     };

system/servenix/hardware-configuration.nix

@@ -92,7 +92,7 @@
       enable32Bit = true;
 
       extraPackages = with pkgs; [
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
 
         nvidia-vaapi-driver