From 882ee908e45281b4bcec93a4e8db85592cdf5aad Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Wed, 5 Nov 2025 19:09:13 +0100 Subject: [PATCH] Home: Update config for new lock --- flake.nix | 2 +- home/christoph/default.nix | 37 ++++++++--------- home/modules/1_deprecated/flatpak/default.nix | 2 +- home/modules/1_deprecated/ranger/default.nix | 2 +- home/modules/git/default.nix | 41 +++++++++++-------- home/modules/hyprland/default.nix | 2 +- home/modules/neovim/default.nix | 20 +++++---- home/modules/neovim/mappings.nix | 6 +-- home/modules/neovim/vim_opts.nix | 1 + system/modules/fonts/default.nix | 2 +- system/nixinator/hardware-configuration.nix | 2 +- system/nixtop/hardware-configuration.nix | 4 +- system/servenix/hardware-configuration.nix | 2 +- 13 files changed, 67 insertions(+), 56 deletions(-) diff --git a/flake.nix b/flake.nix index f7b35d05..c0574d4f 100644 --- a/flake.nix +++ b/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) diff --git a/home/christoph/default.nix b/home/christoph/default.nix index 59f4f44f..ccbf47e1 100644 --- a/home/christoph/default.nix +++ b/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 [ - [] - (lib.mkIf (mylib.modules.contains - config.services.flatpak.packages - "com.discordapp.Discord") [ - # 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 - "com.discordapp.DiscordCanary") [ - # Fix Discord rich presence for Flatpak - "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0" - ]) - ]; + # 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 + # "com.discordapp.Discord") [ + # # 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 + # "com.discordapp.DiscordCanary") [ + # # 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"; diff --git a/home/modules/1_deprecated/flatpak/default.nix b/home/modules/1_deprecated/flatpak/default.nix index 6e3d3e4e..fcc04680 100644 --- a/home/modules/1_deprecated/flatpak/default.nix +++ b/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 { diff --git a/home/modules/1_deprecated/ranger/default.nix b/home/modules/1_deprecated/ranger/default.nix index 9d7a3f2f..abf05f6b 100644 --- a/home/modules/1_deprecated/ranger/default.nix +++ b/home/modules/1_deprecated/ranger/default.nix @@ -33,7 +33,7 @@ in { python310Packages.pillow ffmpegthumbnailer imagemagick - poppler_utils + poppler-utils ]) ]; diff --git a/home/modules/git/default.nix b/home/modules/git/default.nix index 04cd1062..b8b36e16 100644 --- a/home/modules/git/default.nix +++ b/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"; - # 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; + settings = { 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; }; }; } diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix index a3c7f9df..6cdc4e33 100644 --- a/home/modules/hyprland/default.nix +++ b/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 diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix index e146a9ff..9266cdf6 100644 --- a/home/modules/neovim/default.nix +++ b/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 diff --git a/home/modules/neovim/mappings.nix b/home/modules/neovim/mappings.nix index 889719d7..dc11c1bc 100644 --- a/home/modules/neovim/mappings.nix +++ b/home/modules/neovim/mappings.nix @@ -834,19 +834,19 @@ _: let { mode = "n"; key = "tt"; - action = "Trouble diagnostics toggle focus=false win.position=bottom"; + action = "Trouble diagnostics toggle focus=false win.position=left"; options.desc = "Trouble Diagnostics"; } { mode = "n"; key = "tD"; - action = "Trouble todo toggle focus=false win.position=bottom"; + action = "Trouble todo toggle focus=false win.position=left"; options.desc = "Toggle TODOs"; } { mode = "n"; key = "ts"; - action = "Trouble symbols toggle focus=false win.position=right"; + action = "Trouble symbols toggle focus=false win.position=left"; options.desc = "Trouble Symbols"; } { diff --git a/home/modules/neovim/vim_opts.nix b/home/modules/neovim/vim_opts.nix index 2575de66..a44b2a8d 100644 --- a/home/modules/neovim/vim_opts.nix +++ b/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; diff --git a/system/modules/fonts/default.nix b/system/modules/fonts/default.nix index fcc74528..46ef4794 100644 --- a/system/modules/fonts/default.nix +++ b/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 ]; diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index b3392469..8e8ad52e 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/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 diff --git a/system/nixtop/hardware-configuration.nix b/system/nixtop/hardware-configuration.nix index 40869943..a9c63a7b 100644 --- a/system/nixtop/hardware-configuration.nix +++ b/system/nixtop/hardware-configuration.nix @@ -71,8 +71,8 @@ # driSupport = true; # NOTE: Deprecated extraPackages = with pkgs; [ intel-media-driver - vaapiIntel - vaapiVdpau + intel-vaapi-driver + libva-vdpau-driver libvdpau-va-gl ]; }; diff --git a/system/servenix/hardware-configuration.nix b/system/servenix/hardware-configuration.nix index b697fc7a..84752394 100644 --- a/system/servenix/hardware-configuration.nix +++ b/system/servenix/hardware-configuration.nix @@ -92,7 +92,7 @@ enable32Bit = true; extraPackages = with pkgs; [ - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl nvidia-vaapi-driver