sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small modifications to deal with nixos 24.11 build

This commit is contained in:
Sam 2025-01-08 18:41:24 +00:00
parent 6d9c8f18d5
commit 00c79f239d
10 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -632,11 +632,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736326617, "lastModified": 1736355786,
"narHash": "sha256-FkhJpO0sDDJwrme4faEevh8Dbhw/Qj1qGrgPgLHaZ7w=", "narHash": "sha256-pJplWAA4Fg1fp31cWEfboU644Bq5MIAMAvtTsR9dUWc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aedc34a0abc375a413d16802ee5172b4247d20db", "rev": "92cafa173eeb37e9ad3c83d1b12aea21dc0efbb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,11 +698,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1736340431, "lastModified": 1736354715,
"narHash": "sha256-LGvxsz2CbXU7ro6wD5vutBDYR/OEe+3RowzeHvyt6YE=", "narHash": "sha256-phj5W25sMhlkBg8rc3hEzSlZQCfOBipq647bCZ7fOuc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ffd92de0a9e5c1812b00d4e21c8d3b9461409b98", "rev": "3cd3e6c29d1343ab573eae77b881e20cfaf63342",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/common/core/nixvim/plugins/default.nix
View File

@ -25,6 +25,8 @@ in {
./comment.nix ./comment.nix
]; ];
programs.nixvim.plugins.web-devicons.enable = true;
# Load Plugins that aren't provided as modules by nixvim # Load Plugins that aren't provided as modules by nixvim
programs.nixvim.extraPlugins = [ programs.nixvim.extraPlugins = [
pkgs.vimPlugins.vim-numbertoggle pkgs.vimPlugins.vim-numbertoggle

4
home/common/core/nixvim/plugins/lsp.nix
View File

@ -7,7 +7,7 @@ in
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
lua-ls = {enable = true;}; lua_ls = {enable = true;};
nixd = { nixd = {
enable = true; enable = true;
cmd = ["nixd"]; cmd = ["nixd"];
@ -26,7 +26,7 @@ in
marksman = {enable = true;}; marksman = {enable = true;};
ccls = {enable = true;}; ccls = {enable = true;};
cssls = {enable = true;}; cssls = {enable = true;};
tsserver = {enable = true;}; ts-ls = {enable = true;};
}; };
keymaps = { keymaps = {
lspBuf = { lspBuf = {

2
home/common/core/nixvim/plugins/luasnip.nix
View File

@ -1,7 +1,7 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.nixvim.plugins.luasnip = { programs.nixvim.plugins.luasnip = {
enable = true; enable = true;
extraConfig = { settings = {
enable_autosnippets = true; enable_autosnippets = true;
store_selection_keys = "<Tab>"; store_selection_keys = "<Tab>";
}; };

2
home/common/core/nixvim/plugins/surround.nix
View File

@ -1,3 +1,3 @@
{ {
programs.nixvim.plugins.surround.enable = true; # vim-surround programs.nixvim.plugins.vim-surround.enable = true; # vim-surround
} }

1
home/common/optional/desktop/common/firefox.nix
View File

@ -11,6 +11,7 @@
mempoolPort = configVars.networking.addresses.bitcoin-node.services.mempool.port; mempoolPort = configVars.networking.addresses.bitcoin-node.services.mempool.port;
in { in {
programs.firefox = { programs.firefox = {
package = pkgs.firefox-bin;
enable = true; enable = true;
profiles.${user} = { profiles.${user} = {
search = { search = {

2
home/common/optional/desktop/common/themes/standard-dark.nix
View File

@ -15,7 +15,7 @@
package = pkgs.kanagawa-gtk-theme; package = pkgs.kanagawa-gtk-theme;
}; };
iconTheme = { iconTheme = {
package = pkgs.gnome.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
name = "Adwaita"; name = "Adwaita";
}; };

2
home/common/optional/desktop/dwm/dunst.nix
View File

@ -8,7 +8,7 @@
enable = true; enable = true;
iconTheme = { iconTheme = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
size = "16x16"; size = "16x16";
}; };
settings = { settings = {

24
hosts/citadel/default.nix
View File

@ -146,18 +146,18 @@ in {
powerManagement.finegrained = true; powerManagement.finegrained = true;
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
# FIXME issue with stable nvidia driver and latest linux kernel # # FIXME issue with stable nvidia driver and latest linux kernel
# use mkDriver to specify newer nvidia driver that is compatible # # use mkDriver to specify newer nvidia driver that is compatible
# see: https://github.com/NixOS/nixpkgs/issues/341844#issuecomment-2351075413 # # 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 # # 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 { # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.58.02"; # version = "555.58.02";
sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; # sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; # sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8=";
openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; # openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY=";
settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; # settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; # persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw=";
}; # };
}; };
# https://bbs.archlinux.org/viewtopic.php?id=297276 for NVreg_EnableGpuFirmware fix # 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 # https://discourse.nixos.org/t/how-to-use-nvidia-prime-offload-to-run-the-x-server-on-the-integrated-board/9091/15

2
hosts/common/core/default.nix
View File

@ -14,7 +14,7 @@ in
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.modifications outputs.overlays.modifications
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
inputs.nur.overlay inputs.nur.overlays.default
]; ];
config = { config = {
allowUnfree = true; allowUnfree = true;