diff --git a/flake.lock b/flake.lock index cf33190..c84d6be 100644 --- a/flake.lock +++ b/flake.lock @@ -632,11 +632,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736326617, - "narHash": "sha256-FkhJpO0sDDJwrme4faEevh8Dbhw/Qj1qGrgPgLHaZ7w=", + "lastModified": 1736355786, + "narHash": "sha256-pJplWAA4Fg1fp31cWEfboU644Bq5MIAMAvtTsR9dUWc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aedc34a0abc375a413d16802ee5172b4247d20db", + "rev": "92cafa173eeb37e9ad3c83d1b12aea21dc0efbb2", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1736340431, - "narHash": "sha256-LGvxsz2CbXU7ro6wD5vutBDYR/OEe+3RowzeHvyt6YE=", + "lastModified": 1736354715, + "narHash": "sha256-phj5W25sMhlkBg8rc3hEzSlZQCfOBipq647bCZ7fOuc=", "owner": "nix-community", "repo": "NUR", - "rev": "ffd92de0a9e5c1812b00d4e21c8d3b9461409b98", + "rev": "3cd3e6c29d1343ab573eae77b881e20cfaf63342", "type": "github" }, "original": { diff --git a/home/common/core/nixvim/plugins/default.nix b/home/common/core/nixvim/plugins/default.nix index c1298ad..0397ee1 100644 --- a/home/common/core/nixvim/plugins/default.nix +++ b/home/common/core/nixvim/plugins/default.nix @@ -25,6 +25,8 @@ in { ./comment.nix ]; + programs.nixvim.plugins.web-devicons.enable = true; + # Load Plugins that aren't provided as modules by nixvim programs.nixvim.extraPlugins = [ pkgs.vimPlugins.vim-numbertoggle diff --git a/home/common/core/nixvim/plugins/lsp.nix b/home/common/core/nixvim/plugins/lsp.nix index f9b7705..3386fa0 100644 --- a/home/common/core/nixvim/plugins/lsp.nix +++ b/home/common/core/nixvim/plugins/lsp.nix @@ -7,7 +7,7 @@ in lsp = { enable = true; servers = { - lua-ls = {enable = true;}; + lua_ls = {enable = true;}; nixd = { enable = true; cmd = ["nixd"]; @@ -26,7 +26,7 @@ in marksman = {enable = true;}; ccls = {enable = true;}; cssls = {enable = true;}; - tsserver = {enable = true;}; + ts-ls = {enable = true;}; }; keymaps = { lspBuf = { diff --git a/home/common/core/nixvim/plugins/luasnip.nix b/home/common/core/nixvim/plugins/luasnip.nix index ef93822..34c3733 100644 --- a/home/common/core/nixvim/plugins/luasnip.nix +++ b/home/common/core/nixvim/plugins/luasnip.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { programs.nixvim.plugins.luasnip = { enable = true; - extraConfig = { + settings = { enable_autosnippets = true; store_selection_keys = ""; }; diff --git a/home/common/core/nixvim/plugins/surround.nix b/home/common/core/nixvim/plugins/surround.nix index cfee34b..b546a18 100644 --- a/home/common/core/nixvim/plugins/surround.nix +++ b/home/common/core/nixvim/plugins/surround.nix @@ -1,3 +1,3 @@ { - programs.nixvim.plugins.surround.enable = true; # vim-surround + programs.nixvim.plugins.vim-surround.enable = true; # vim-surround } diff --git a/home/common/optional/desktop/common/firefox.nix b/home/common/optional/desktop/common/firefox.nix index 8d1993e..1cb5073 100644 --- a/home/common/optional/desktop/common/firefox.nix +++ b/home/common/optional/desktop/common/firefox.nix @@ -11,6 +11,7 @@ mempoolPort = configVars.networking.addresses.bitcoin-node.services.mempool.port; in { programs.firefox = { + package = pkgs.firefox-bin; enable = true; profiles.${user} = { search = { diff --git a/home/common/optional/desktop/common/themes/standard-dark.nix b/home/common/optional/desktop/common/themes/standard-dark.nix index 1ad5267..f5b1549 100644 --- a/home/common/optional/desktop/common/themes/standard-dark.nix +++ b/home/common/optional/desktop/common/themes/standard-dark.nix @@ -15,7 +15,7 @@ package = pkgs.kanagawa-gtk-theme; }; iconTheme = { - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; name = "Adwaita"; }; diff --git a/home/common/optional/desktop/dwm/dunst.nix b/home/common/optional/desktop/dwm/dunst.nix index 81f57de..dd08974 100644 --- a/home/common/optional/desktop/dwm/dunst.nix +++ b/home/common/optional/desktop/dwm/dunst.nix @@ -8,7 +8,7 @@ enable = true; iconTheme = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; size = "16x16"; }; settings = { diff --git a/hosts/citadel/default.nix b/hosts/citadel/default.nix index f1d1684..83ccdae 100644 --- a/hosts/citadel/default.nix +++ b/hosts/citadel/default.nix @@ -146,18 +146,18 @@ in { powerManagement.finegrained = true; open = false; nvidiaSettings = true; - # FIXME issue with stable nvidia driver and latest linux kernel - # use mkDriver to specify newer nvidia driver that is compatible - # see: https://github.com/NixOS/nixpkgs/issues/341844#issuecomment-2351075413 - # and https://discourse.nixos.org/t/builder-for-nvidia-x11-550-78-6-10-drv-failed-with-exit-code-2/49360/32 - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.58.02"; - sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; - sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; - openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; - settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; - persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; - }; + # # FIXME issue with stable nvidia driver and latest linux kernel + # # use mkDriver to specify newer nvidia driver that is compatible + # # see: https://github.com/NixOS/nixpkgs/issues/341844#issuecomment-2351075413 + # # and https://discourse.nixos.org/t/builder-for-nvidia-x11-550-78-6-10-drv-failed-with-exit-code-2/49360/32 + # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "555.58.02"; + # sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; + # sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; + # openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; + # settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; + # persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; + # }; }; # https://bbs.archlinux.org/viewtopic.php?id=297276 for NVreg_EnableGpuFirmware fix # https://discourse.nixos.org/t/how-to-use-nvidia-prime-offload-to-run-the-x-server-on-the-integrated-board/9091/15 diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index 0074988..f702b14 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -14,7 +14,7 @@ in outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages - inputs.nur.overlay + inputs.nur.overlays.default ]; config = { allowUnfree = true;