Compare commits

...

4 Commits

Author SHA1 Message Date
54b0bb5e7b
refactor(nvim): disable jdtls formatter and use google_java_format
Some checks failed
Check Formatting of Files / Check-Formatting (push) Failing after 1m7s
2024-06-22 05:25:53 -05:00
7c950cee65
build(nix): update flake.lock 2024-06-21 15:42:56 -05:00
79bc616136
refactor(nix/host/orion): use hardware.graphics instead of hardware.opengl
`hardware.opengl` was renamed/deprecated
2024-06-21 15:42:14 -05:00
3a87e6e317
refactor(nix/host/orion): cleanup audio settings 2024-06-21 15:41:14 -05:00
4 changed files with 20 additions and 32 deletions

30
flake.lock generated
View File

@ -11,11 +11,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1709831932, "lastModified": 1718869541,
"narHash": "sha256-WsP8rOFa/SqYNbVtYJ/l2mWWOgyDTJFbITMV8tv0biI=", "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=",
"owner": "yaxitech", "owner": "yaxitech",
"repo": "ragenix", "repo": "ragenix",
"rev": "06de099ef02840ec463419f12de73729d458e1eb", "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718588625, "lastModified": 1718846788,
"narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718744742, "lastModified": 1718983978,
"narHash": "sha256-kOG10gJ3zLZNiom9NXJM4/mA4/lsmR3rp74YVw+iros=", "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0dd1c1495af6e6424695670343236f0053bf4947", "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -391,11 +391,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1718738684, "lastModified": 1718829834,
"narHash": "sha256-PxJuFe186iEUkJ7aB1lEUKRscKWy4yC+hGNXhOTgTaY=", "narHash": "sha256-SBioRAhjYMcoBpIGV+kdquRjlm8DRD2dv8N4RXM694U=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "0c6029669dcd591705770d4e49ff9cd73b9e2d5d", "rev": "1c131ec2b71fa7ad6fd285ed2a9fcc4cf616b3a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1718530797, "lastModified": 1718895438,
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,21 +1,8 @@
{ ... }:
{ {
inputs,
lib,
pkgs,
...
}:
{
hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa = { alsa.enable = true;
enable = true;
support32Bit = true;
};
pulse.enable = true;
wireplumber.enable = true;
jack.enable = true;
}; };
} }

View File

@ -26,6 +26,6 @@
]; ];
}; };
}; };
hardware.opengl.enable = true; hardware.graphics.enable = true;
services.spice-vdagentd.enable = true; services.spice-vdagentd.enable = true;
} }

View File

@ -209,6 +209,7 @@ return {
local null_ls = require("null-ls") local null_ls = require("null-ls")
null_ls.setup({ null_ls.setup({
sources = { sources = {
null_ls.builtins.formatting.google_java_format,
null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.stylua,
null_ls.builtins.formatting.asmfmt, null_ls.builtins.formatting.asmfmt,
null_ls.builtins.formatting.black, null_ls.builtins.formatting.black,
@ -231,7 +232,7 @@ return {
vim.lsp.buf.format({ vim.lsp.buf.format({
async = true, async = true,
filter = function(client) filter = function(client)
return not vim.list_contains({ "lua_ls" }, client.name) return not vim.list_contains({ "lua_ls", "jdtls" }, client.name)
end, end,
}) })
end, end,