Skip to content

Commit 88ad693

Browse files
functorafunctora
committed
upgrade nixos
1 parent e0ed64d commit 88ad693

File tree

3 files changed

+104
-42
lines changed

3 files changed

+104
-42
lines changed

‎nix/configuration.nix‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
vi = import ./../pub/vi/nix/default.nix {};
88
dns = ["8.8.8.8" "8.8.4.4"];
99
unst = import ./nixpkgs-unstable.nix;
10+
vkdoom = import ./vkdoom.nix {inherit pkgs;};
1011
# xkb = pkgs.writeText "xkb-layout" (builtins.readFile ./../cfg/.Xmodmap);
1112
# yewtube = import ./yewtube.nix;
1213
qmk-setup = import ./qmk-setup.nix;
@@ -19,10 +20,6 @@
1920
url = "https://github.com/NixOS/nixos-hardware/archive/fa194fc484fd7270ab324bb985593f71102e84d1.tar.gz";
2021
sha256 = "06yn179lbhql3vkk4cjca4mdwr6lfdh6n1vqma3a4266dap6hcf4";
2122
};
22-
kmonad-srv = builtins.fetchTarball {
23-
url = "https://github.com/kmonad/kmonad/archive/3413f1be996142c8ef4f36e246776a6df7175979.tar.gz";
24-
sha256 = "0mm439r5qkkpld51spbkmn0qy27sff6iw8c7mb87x73xk4z5cjxq";
25-
};
2623
kmonad-src = builtins.fetchTarball {
2724
url = "https://github.com/kmonad/kmonad/archive/820af08d1ef1bff417829415d5f673041b67ef4d.tar.gz";
2825
sha256 = "0kkayvcc9jmjm1z1rgabkq36hyrpqdkm8z998dsyg6yh05aqpfzz";
@@ -36,10 +33,6 @@
3633
) {src = "${kmonad-src}/nix";})
3734
.defaultNix
3835
.default;
39-
obelisk = import (fetchTarball {
40-
url = "https://github.com/obsidiansystems/obelisk/archive/41f97410cfa2e22a4ed9e9344abcd58bbe0f3287.tar.gz";
41-
sha256 = "04bpzji7y3nz573ib3g6icb56s5zbj4zxpakhqaql33v2v77hi9g";
42-
}) {};
4336
blocked-hosts =
4437
builtins.concatStringsSep "\n"
4538
(builtins.map (x: "127.0.0.1 ${x} www.${x} www2.${x} web.${x} rus.${x} news.${x}")
@@ -345,11 +338,10 @@
345338
in {
346339
imports =
347340
[
348-
(import "${nixos-hardware}/common/cpu/intel")
349-
(import "${nixos-hardware}/common/pc/laptop")
350-
(import "${nixos-hardware}/common/pc/laptop/ssd")
341+
# (import "${nixos-hardware}/common/cpu/intel")
342+
# (import "${nixos-hardware}/common/pc/laptop")
343+
# (import "${nixos-hardware}/common/pc/laptop/ssd")
351344
(import "${home-manager}/nixos")
352-
(import "${kmonad-srv}/nix/nixos-module.nix")
353345
(import ./rigtora.nix)
354346
]
355347
++ (
@@ -418,18 +410,21 @@ in {
418410
security.polkit.enable = true;
419411
security.pam.services.swaylock = {};
420412
#
421-
# Nvidia
413+
# GPU
422414
#
423415
hardware.opengl = {
424416
enable = true;
425-
driSupport = true;
426417
driSupport32Bit = true;
427418
extraPackages = with pkgs; [
428-
vulkan-validation-layers
429-
intel-media-driver # LIBVA_DRIVER_NAME=iHD
430-
vaapiIntel # LIBVA_DRIVER_NAME=i965
431-
vaapiVdpau
432-
libvdpau-va-gl
419+
amdvlk
420+
# vulkan-validation-layers
421+
# intel-media-driver # LIBVA_DRIVER_NAME=iHD
422+
# vaapiIntel # LIBVA_DRIVER_NAME=i965
423+
# vaapiVdpau
424+
# libvdpau-va-gl
425+
];
426+
extraPackages32 = with pkgs; [
427+
driversi686Linux.amdvlk
433428
];
434429
};
435430
#
@@ -810,17 +805,29 @@ in {
810805
'';
811806
}
812807
// mkFirejailCustom {
813-
pkg = "doom2";
808+
pkg = "doom-free2";
814809
dir = "doom";
815810
exe = ''
816-
${pkgs.gzdoom}/bin/gzdoom \
811+
${unst.gzdoom}/bin/gzdoom \
812+
-iwad ./freedoom-0.13.0/freedoom2.wad \
813+
-file ./Project_Brutality-PB_Staging.zip \
814+
-file ./SimpleSlots.1.1.pk7
815+
'';
816+
}
817+
// mkFirejailCustom {
818+
pkg = "doom-dsc";
819+
dir = "doom";
820+
exe = ''
821+
${vkdoom}/bin/vkdoom \
817822
-iwad ./freedoom-0.13.0/freedoom2.wad \
818-
-file ./brutalv22test4.pk3 \
823+
-file ./dsc/DSC-1.0.2.pk3 \
824+
-file ./dsc/DSCmaterialPack.pk3 \
825+
-file ./Project_Brutality-PB_Staging.zip \
819826
-file ./SimpleSlots.1.1.pk7
820827
'';
821828
}
822829
// mkFirejailCustom {
823-
pkg = "ashes1";
830+
pkg = "doom-ashes1";
824831
dir = "doom";
825832
exe = ''
826833
${pkgs.gzdoom}/bin/gzdoom \
@@ -870,7 +877,7 @@ in {
870877
xdg-utils
871878
glib
872879
dracula-theme
873-
gnome3.adwaita-icon-theme
880+
adwaita-icon-theme
874881
#
875882
# apps
876883
#
@@ -879,18 +886,15 @@ in {
879886
shellcheck
880887
chromium
881888
xournalpp
882-
gnome.nautilus
889+
nautilus
883890
ccrypt
884-
awscli2
885891
libreoffice
886892
tor-browser-bundle-bin
887893
kooha
888894
mpv
889895
qmk
890896
qmk-setup
891-
prusa-slicer
892-
cura
893-
freecad
897+
# cura
894898
lesspass-cli
895899
# mkdir -p ~/macos/Public
896900
# cd ~/macos
@@ -902,7 +906,7 @@ in {
902906
via
903907
vial
904908
usbutils
905-
gnome.simple-scan
909+
simple-scan
906910
system-config-printer
907911
pulsemixer
908912
];
@@ -1193,6 +1197,7 @@ in {
11931197
# GUI
11941198
#
11951199
enable = true;
1200+
videoDrivers = ["amdgpu"];
11961201
displayManager.gdm.enable = true;
11971202
displayManager.gdm.wayland = true;
11981203
displayManager.defaultSession = "sway";

‎nix/sources.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": "https://input-output-hk.github.io/haskell.nix",
66
"owner": "input-output-hk",
77
"repo": "haskell.nix",
8-
"rev": "55b597cbba1d472959b6b9ce9a0881fad1a9b297",
9-
"sha256": "196hp2jd5y4kafnwbsbws327wg5g88hw4knqfvx0vfxp9q8dv1hc",
8+
"rev": "cdcce3719c3f47402e9e447961ca66e063d65ea7",
9+
"sha256": "17s05c7yxa8ww2rbr2bf0v5pyzirsghx73lm7cml3jabs8y2k4bm",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/55b597cbba1d472959b6b9ce9a0881fad1a9b297.tar.gz",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/cdcce3719c3f47402e9e447961ca66e063d65ea7.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"newpkgs": {
@@ -17,10 +17,10 @@
1717
"homepage": "",
1818
"owner": "NixOS",
1919
"repo": "nixpkgs",
20-
"rev": "32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b",
21-
"sha256": "0y3ap96m352id5r3kj8i7xcslpy4sg350nbyipzbihgjdvr8hnwa",
20+
"rev": "21a2e1ea4388d7f775c304697cee826eb69060c5",
21+
"sha256": "1x52f7a1izy2697d5bcm62rysl0cs7scdzkg0fzqxpldjzlnffj0",
2222
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b.tar.gz",
23+
"url": "https://github.com/NixOS/nixpkgs/archive/21a2e1ea4388d7f775c304697cee826eb69060c5.tar.gz",
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"nixpkgs": {
@@ -29,10 +29,10 @@
2929
"homepage": "",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b",
33-
"sha256": "0y3ap96m352id5r3kj8i7xcslpy4sg350nbyipzbihgjdvr8hnwa",
32+
"rev": "21a2e1ea4388d7f775c304697cee826eb69060c5",
33+
"sha256": "1x52f7a1izy2697d5bcm62rysl0cs7scdzkg0fzqxpldjzlnffj0",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/21a2e1ea4388d7f775c304697cee826eb69060c5.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"nixpkgs-unstable": {
@@ -41,10 +41,10 @@
4141
"homepage": "",
4242
"owner": "NixOS",
4343
"repo": "nixpkgs",
44-
"rev": "93ff48c9be84a76319dac293733df09bbbe3f25c",
45-
"sha256": "038m7932v4z0zn2lk7k7mbqbank30q84r1viyhchw9pcm3aq3q23",
44+
"rev": "3a05eebede89661660945da1f151959900903b6a",
45+
"sha256": "0n56l6v5k3lmrr4vjnp6xk1s46shkwdkvai05dzcbcabpl29yb9g",
4646
"type": "tarball",
47-
"url": "https://github.com/NixOS/nixpkgs/archive/93ff48c9be84a76319dac293733df09bbbe3f25c.tar.gz",
47+
"url": "https://github.com/NixOS/nixpkgs/archive/3a05eebede89661660945da1f151959900903b6a.tar.gz",
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
}
5050
}

‎nix/vkdoom.nix‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{pkgs, ...}: let
2+
repo = {
3+
pname = "vkdoom";
4+
version = "640a2b2c4104d957309ffe6d11de8b7e62e1cbb6";
5+
src = pkgs.fetchgit {
6+
url = "https://github.com/dpjudas/VkDoom";
7+
rev = "640a2b2c4104d957309ffe6d11de8b7e62e1cbb6";
8+
fetchSubmodules = false;
9+
deepClone = false;
10+
leaveDotGit = true;
11+
sparseCheckout = [];
12+
sha256 = "sha256-ahHtgOyB/Z+8J4Uou1CWEg1gR5jUUayoWnb3N1ahRpg=";
13+
};
14+
date = "2025-02-22";
15+
};
16+
in
17+
pkgs.stdenv.mkDerivation {
18+
pname = repo.pname;
19+
src = repo.src;
20+
version = repo.date;
21+
22+
nativeBuildInputs = with pkgs; [
23+
cmake
24+
git
25+
makeWrapper
26+
];
27+
28+
buildInputs = with pkgs; [
29+
SDL2
30+
gtk3
31+
libvpx
32+
openal
33+
zmusic
34+
];
35+
36+
postInstall = ''
37+
for bin in vkdoom vktool; do
38+
mv $out/bin/$bin $out/share/games/doom/$bin
39+
makeWrapper $out/share/games/doom/$bin $out/bin/$bin \
40+
--set LD_LIBRARY_PATH ${with pkgs; lib.makeLibraryPath [vulkan-loader]}
41+
done
42+
'';
43+
44+
cmakeFlags = [
45+
"-DDYN_GTK=OFF"
46+
"-DDYN_OPENAL=OFF"
47+
];
48+
49+
NIX_CFLAGS_COMPILE = ["-Wno-error=format-security"];
50+
51+
meta = with pkgs.lib; {
52+
description = "ZDoom based source port with a primary focus on Vulkan and modern computers";
53+
homepage = "https://vkdoom.org/";
54+
license = licenses.gpl3Plus;
55+
platforms = platforms.linux;
56+
};
57+
}

0 commit comments

Comments
 (0)