Merge branch 'master' of https://git.deepnet.com/jsutter/nixos
This commit is contained in:
commit
6e68c1acbd
7 changed files with 16 additions and 22 deletions
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719180626,
|
||||
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
|
||||
"lastModified": 1720470846,
|
||||
"narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
|
||||
"rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -22,11 +22,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1719322773,
|
||||
"narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
|
||||
"lastModified": 1720515935,
|
||||
"narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "caabc425565bbd5c8640630b0bf6974961a49242",
|
||||
"rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -38,11 +38,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1719254875,
|
||||
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
|
||||
"lastModified": 1720418205,
|
||||
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
|
||||
"rev": "655a58a72a6601292512670343087c2d75d859c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
./users/isutter.nix
|
||||
./users/aksutter.nix
|
||||
./modules/plasma.nix
|
||||
./modules/virtualization.nix
|
||||
# ./modules/3dprinting.nix
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
spice-protocol
|
||||
win-virtio
|
||||
win-spice
|
||||
quickemu
|
||||
# quickemu
|
||||
spicy
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,11 @@
|
|||
#scaling
|
||||
#services.xserver.dpi = 227;
|
||||
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
rocm-opencl-icd
|
||||
rocm-opencl-runtime
|
||||
amdvlk
|
||||
];
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
networking.bridges = {
|
||||
"br0" = {
|
||||
|
|
|
|||
|
|
@ -112,7 +112,6 @@
|
|||
libgdiplus
|
||||
unzip
|
||||
clinfo
|
||||
python3
|
||||
virt-manager
|
||||
adoptopenjdk-icedtea-web
|
||||
javaPackages.openjfx17
|
||||
|
|
|
|||
|
|
@ -13,13 +13,10 @@
|
|||
|
||||
services.xserver.videoDrivers = [ ];
|
||||
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
rocm-opencl-icd
|
||||
rocm-opencl-runtime
|
||||
];
|
||||
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
# hardware.graphics.extraPackages = with pkgs; [
|
||||
# rocm-opencl-icd
|
||||
# rocm-opencl-runtime
|
||||
# ];
|
||||
|
||||
networking.bridges = {
|
||||
"br0" = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
let
|
||||
home-manager = builtins.fetchTarball {
|
||||
url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
|
||||
# sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue