Skip to content

Commit

Permalink
Updated flake package versions (flake.lock)
Browse files Browse the repository at this point in the history
Due to an issue on unstable, had to disable 3 lsp servers in neovim
config.  (see NixOS/nixpkgs#335559)

Made various small changes to keep up w/ nix api changes
  • Loading branch information
jwyuen committed Aug 22, 2024
1 parent 0e03ea0 commit 9ee8c9a
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 99 deletions.
167 changes: 82 additions & 85 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions nix-config/home/neovim.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ in {
enable = true;
servers = {
bashls.enable = true;
cssls.enable = true;
# cssls.enable = true;
docker-compose-language-service.enable = true;
dockerls.enable = true;
html.enable = true;
jsonls.enable = true;
# html.enable = true;
# jsonls.enable = true;
lua-ls.enable = true;
marksman.enable = true;
nil-ls.enable = true;
Expand Down
1 change: 1 addition & 0 deletions nix-config/hosts/nix-vm/hardware.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/F318-54FD";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};

swapDevices =
Expand Down
15 changes: 8 additions & 7 deletions nix-config/system/displaymanager.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ theKBDLayout theSecondKBDLayout; in
layout = "${theKBDLayout}, ${theSecondKBDLayout}";
options = "ctrl:nocaps";
};
libinput.enable = true;
displayManager.sddm = {
enable = true;
autoNumlock = true;
wayland.enable = true;
theme = "tokyo-night-sddm";
};
};
services.displayManager.sddm = {
enable = true;
autoNumlock = true;
wayland.enable = true;
theme = "tokyo-night-sddm";
};
services.libinput.enable = true;

# environment.variables = {
# GDK_SCALE = "1.2";
# GDK_DPI_SCALE = "0.8";
Expand Down
5 changes: 2 additions & 3 deletions nix-config/system/opengl.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

{
# OpenGL
hardware.opengl = {
hardware.graphics = {
enable = true;
driSupport = true;
driSupport32Bit = true;
enable32Bit = true;
};
}
1 change: 0 additions & 1 deletion nix-config/system/services.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
jack.enable = true;
};
hardware.pulseaudio.enable = false;
sound.enable = true;
security.rtkit.enable = true;
programs.thunar.enable = true;
services.gvfs.enable = true;
Expand Down

0 comments on commit 9ee8c9a

Please sign in to comment.