summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzat Bahawi <azat@bahawi.net>2023-10-13 20:39:39 +0300
committerAzat Bahawi <azat@bahawi.net>2023-10-13 20:39:39 +0300
commit8207b0e249513feffd163d4228de685530fc665b (patch)
treec3b9e26b0b4f49873b2fc70bfc7f3b4a8a65f8bb
parent0221d5913ea26fde9493dadfbb265f2ff103124f (diff)
2023-10-13
-rw-r--r--darwinConfigurations/mairon/default.nix4
-rw-r--r--flake.lock88
-rw-r--r--flake.nix1
-rw-r--r--lib/my.nix18
-rw-r--r--modules/common/common/home-manager.nix4
-rw-r--r--modules/common/emacs/default.nix19
-rw-r--r--modules/common/emacs/doom/config.el3
-rw-r--r--modules/common/profiles/dev/editorconfig.ini4
-rw-r--r--modules/common/vscode.nix2
-rw-r--r--modules/darwin/homebrew.nix2
-rw-r--r--modules/darwin/profiles/headful.nix2
-rw-r--r--modules/darwin/vim/default.nix21
-rw-r--r--modules/nixos/common/security.nix4
-rw-r--r--modules/nixos/games/steam-run.nix4
-rw-r--r--nixosConfigurations/default.nix11
-rw-r--r--nixosConfigurations/eonwe/default.nix1
-rw-r--r--packages/openssl_1_0_0.nix39
17 files changed, 141 insertions, 86 deletions
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index 00df257..5df2297 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -18,7 +18,8 @@ with lib; {
];
brews = [
{name = "carthage";}
- {name = "m1-terraform-provider-helper";}
+ {name = "go@1.21";}
+ {name = "m1-terraform-provider-helper";} # kreuzwerker/homebrew-taps
{name = "sourcery";}
{name = "xcodegen";}
];
@@ -26,7 +27,6 @@ with lib; {
{name = "burp-suite";}
{name = "cocoapods";}
{name = "docker";}
- {name = "go";}
{name = "jetbrains-toolbox";}
{name = "obs";}
{name = "openlens";}
diff --git a/flake.lock b/flake.lock
index d1ecf4c..fa38b1e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -13,11 +13,11 @@
]
},
"locked": {
- "lastModified": 1695384796,
+ "lastModified": 1696775529,
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
+ "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
"type": "github"
},
"original": {
@@ -70,11 +70,11 @@
]
},
"locked": {
- "lastModified": 1695631916,
- "narHash": "sha256-/VSzU9MRKB/9EE5EP6vkamC6Ree14hRdzZkdmdGmEFM=",
+ "lastModified": 1696858737,
+ "narHash": "sha256-xSWYkFEL8uToA1fye7nLPpHdi1H6dUFKD+2dZbniEBA=",
"owner": "dwarfmaster",
"repo": "arkenfox-nixos",
- "rev": "4e724d5102a289400ea535429c331b23b3799de5",
+ "rev": "6bbb7377ea4c68a9b414f6dfabefef398fbfd5f5",
"type": "github"
},
"original": {
@@ -147,11 +147,11 @@
]
},
"locked": {
- "lastModified": 1696043447,
- "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
+ "lastModified": 1696360011,
+ "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
+ "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
"type": "github"
},
"original": {
@@ -188,11 +188,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -209,11 +209,11 @@
]
},
"locked": {
- "lastModified": 1693611461,
- "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
+ "lastModified": 1696343447,
+ "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
+ "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
@@ -287,11 +287,11 @@
]
},
"locked": {
- "lastModified": 1696063111,
- "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
+ "lastModified": 1696940889,
+ "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
+ "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
"type": "github"
},
"original": {
@@ -346,11 +346,11 @@
]
},
"locked": {
- "lastModified": 1696036450,
- "narHash": "sha256-h8Bm29mgi84ExURlvXS1BGctts2FKmbtLHK9/H0dq0E=",
+ "lastModified": 1697159870,
+ "narHash": "sha256-2ARvI9iPHzMqNgUES5LrDoa3yIqH+zKj14nn7ZlAyFM=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
- "rev": "1c3622d8b71d32deaaa5d27220703fbe2dc3d900",
+ "rev": "a2c5018185c388e2e586bd86ffb219824c9736d8",
"type": "github"
},
"original": {
@@ -373,11 +373,11 @@
]
},
"locked": {
- "lastModified": 1696036838,
- "narHash": "sha256-GmzS2RWWG98Lw/NsXlBpVxBfH9deP6UtyB/IKj/vKUw=",
+ "lastModified": 1697160521,
+ "narHash": "sha256-+AtNj68qtib9/zehKpgActGdj63vFe1fIupJ3Nr9sKQ=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "d9c11ddc1817497981466faba1fc7b8d1ea4f865",
+ "rev": "86e879077c11c76c6cc9abeb782b688c42338db7",
"type": "github"
},
"original": {
@@ -389,11 +389,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1695887975,
- "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=",
+ "lastModified": 1697100850,
+ "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e",
+ "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565",
"type": "github"
},
"original": {
@@ -405,11 +405,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1695837737,
- "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=",
+ "lastModified": 1697009197,
+ "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9",
+ "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54",
"type": "github"
},
"original": {
@@ -421,11 +421,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1696072632,
- "narHash": "sha256-1OptCtmN9TKjORwetaf7q17QSm5Mm3c33GeI3rPmepg=",
+ "lastModified": 1697193098,
+ "narHash": "sha256-ImFPj1jDhrkUKI6zH59JDuvSjDueRBNGR+koPNObuqA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e14dd9c00cfa2690820b86410834130586f8cbf4",
+ "rev": "784bf5dd5e78d565f8cdccfb4950a32ef13c8e7d",
"type": "github"
},
"original": {
@@ -437,11 +437,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1696068958,
- "narHash": "sha256-KIGoNwQJ9fhRX5//HI0Fzvu7wMyZhliBJH4YOfS2DIo=",
+ "lastModified": 1697165465,
+ "narHash": "sha256-yhdZ20thGM79xKSnRx4bjxVc6JdgUv51kqJbF+Ypr+s=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8804d8199e6570113477ec4b624e74d250230c49",
+ "rev": "4c4f6ddbbc9677882a3f90ddc24860af71530bfb",
"type": "github"
},
"original": {
@@ -465,11 +465,11 @@
]
},
"locked": {
- "lastModified": 1695992447,
- "narHash": "sha256-Vmg5Xvx3RR8zxWiIkJko1K9MT9Z0HSVj7GTZigveFCs=",
+ "lastModified": 1697021599,
+ "narHash": "sha256-hyBRPjcGIwMxpL/vw29WRgPzKiBzJa45QLSZ9ja85h0=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "3fa81dd06341ad9958b2b51b9e71448f693917f9",
+ "rev": "752f0481cecabb104f30aaec1010721a4a5dfb95",
"type": "github"
},
"original": {
@@ -515,11 +515,11 @@
},
"nur": {
"locked": {
- "lastModified": 1696066359,
- "narHash": "sha256-yt94loEvHjuzQ+aIVLvN6OzzXtWq7nDgHhxJ11bqZIc=",
+ "lastModified": 1697194029,
+ "narHash": "sha256-SfmWfd6NXgPy7ZfkSRo+0/WQfjj6ZyKzAMm5GPQ+Vcc=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "9948d7c2cf064aa08f6df8f925a811d0f0950e5b",
+ "rev": "5c94a59b03b744fe305c6300e16ab9526d0c6cf3",
"type": "github"
},
"original": {
@@ -606,11 +606,11 @@
]
},
"locked": {
- "lastModified": 1695576016,
- "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
+ "lastModified": 1696846637,
+ "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
+ "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index da326a3..b23943e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -364,6 +364,7 @@
mpv-autosub = prev.callPackage ./packages/mpv-autosub.nix {};
myip = prev.callPackage ./packages/myip.nix {};
nixfiles = prev.callPackage ./packages/nixfiles.nix {};
+ openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix {};
logcli = prev.grafana-loki.overrideAttrs (_: super: {
pname = "logcli";
subPackages = ["cmd/logcli"];
diff --git a/lib/my.nix b/lib/my.nix
index 8ae8840..55eff4f 100644
--- a/lib/my.nix
+++ b/lib/my.nix
@@ -135,6 +135,7 @@ with lib;
hashedPassword = "@HASHED_PASSWORD@";
configurations = {
+ # VPS in Germany.
manwe = {
system = "x86_64-linux";
isHeadless = true;
@@ -175,6 +176,7 @@ with lib;
];
};
+ # VPS in Germany.
varda = {
system = "x86_64-linux";
isHeadless = true;
@@ -195,6 +197,7 @@ with lib;
};
};
+ # VPS in France.
yavanna = {
system = "x86_64-linux";
isHeadless = true;
@@ -221,6 +224,7 @@ with lib;
syncthing.id = "@SYNCTHING_ID@";
};
+ # A beefy desktop: 7950x/rx6750xt/128GB.
eonwe = {
system = "x86_64-linux";
isHeadful = true;
@@ -232,6 +236,7 @@ with lib;
syncthing.id = "@SYNCTHING_ID@";
};
+ # ThinkPad T480.
melian = {
system = "x86_64-linux";
isHeadful = true;
@@ -243,6 +248,7 @@ with lib;
syncthing.id = "@SYNCTHING_ID@";
};
+ # Macbook Air M1.
mairon = {
system = "aarch64-darwin";
isHeadful = true;
@@ -253,6 +259,7 @@ with lib;
};
};
+ # Google Pixel 4a w/ GrapheneOS.
gothmog = {
isOther = true;
wireguard = {
@@ -262,6 +269,17 @@ with lib;
};
syncthing.id = "@SYNCTHING_ID@";
};
+
+ # Google Pixel 7a w/ GrapheneOS.
+ lungorthin = {
+ isOther = true;
+ wireguard = {
+ ipv4.address = "10.69.5.2";
+ ipv6.address = "fd69::5:2";
+ publicKey = "@PUBLIC_KEY@";
+ };
+ syncthing.id = "@SYNCTHING_ID@";
+ };
};
};
}
diff --git a/modules/common/common/home-manager.nix b/modules/common/common/home-manager.nix
index 44b0eaa..97d7286 100644
--- a/modules/common/common/home-manager.nix
+++ b/modules/common/common/home-manager.nix
@@ -11,8 +11,8 @@ with lib; {
hm = {
news.display = "silent";
- # NOTE Inheriting directly from `system.stateVersion` does not work on MacOS for
- # some reason.
+ # NOTE Inheriting directly from `system.stateVersion` does not work with
+ # nix-darwin for some reason.
home.stateVersion = with builtins;
head (split "\n" (readFile "${inputs.nixpkgs}/.version"));
};
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index a21b5ab..dfc657c 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -88,6 +88,11 @@ in {
gore # :lang go
gotools # :lang go
graphviz # :lang (org +roam2) :lang plantuml
+ haskellPackages.cabal-fmt # :lang haskell :editor format
+ haskellPackages.cabal-install # :lang haskell
+ haskellPackages.haskell-language-server # :lang (haskell +lsp)
+ haskellPackages.hoogle # :lang haskell
+ haskellPackages.ormolu # :lang haskell :editor format
html-tidy # :lang web
jre # :lang plantuml
libtool # :term vterm
@@ -124,19 +129,7 @@ in {
if (this.system != "aarch64-darwin")
then [gdb] # :tools debugger
else [lldb] # :tools debugger
- )
- ++ optionals (!pkgs.stdenv.isDarwin)
- [
- # NOTE Haskell is pretty much broken every couple of days on
- # MacOS and I usually don't write anything in Haskell while
- # I'm on my work laptop, so... ShellCheck seems to be working,
- # though.
- haskellPackages.ormolu # :lang haskell :editor format
- haskellPackages.haskell-language-server # :lang (haskell +lsp)
- haskellPackages.cabal-fmt # :lang haskell :editor format
- haskellPackages.cabal-install # :lang haskell
- haskellPackages.hoogle # :lang haskell
- ];
+ );
in ''
;; This will integrate packages which are required by various
;; modules without polluting the user's profile.
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 015954b..0000679 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -70,7 +70,8 @@
;;; Elisp
;;
-(pushnew! flycheck-disabled-checkers 'emacs-lisp-checkdoc)
+(after! flycheck
+ (pushnew! flycheck-disabled-checkers 'emacs-lisp-checkdoc))
;;
;;; Haskell
diff --git a/modules/common/profiles/dev/editorconfig.ini b/modules/common/profiles/dev/editorconfig.ini
index 17b0317..098229f 100644
--- a/modules/common/profiles/dev/editorconfig.ini
+++ b/modules/common/profiles/dev/editorconfig.ini
@@ -62,6 +62,10 @@ max_line_length = 72
indent_size = 4
indent_style = tab
+[*.{tf,hcl}]
+indent_size = 2
+indent_style = space
+
[configure.ac]
indent_size = 4
indent_style = tab
diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix
index ab55acc..3ae9800 100644
--- a/modules/common/vscode.nix
+++ b/modules/common/vscode.nix
@@ -168,7 +168,7 @@ in {
terraform = {
languageServer.path = "${pkgs.terraform-ls}/bin/terraform-ls";
- languageServer.terraform.path = "${pkgs.terraform}/bin/terraform";
+ languageServer.terraform.path = "${pkgs.opentofu}/bin/tofu";
};
haskell = {
diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index 2667828..643787a 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -23,8 +23,8 @@ in {
enable = true;
onActivation = {
autoUpdate = true;
- cleanup = "zap";
upgrade = true;
+ cleanup = "zap";
};
};
};
diff --git a/modules/darwin/profiles/headful.nix b/modules/darwin/profiles/headful.nix
index c50c657..01b1951 100644
--- a/modules/darwin/profiles/headful.nix
+++ b/modules/darwin/profiles/headful.nix
@@ -19,9 +19,9 @@ in {
];
homebrew.casks = [
- {name = "chromium";}
{name = "firefox";}
{name = "iterm2";}
+ {name = "macfuse";}
{name = "telegram-desktop";}
];
};
diff --git a/modules/darwin/vim/default.nix b/modules/darwin/vim/default.nix
index 519f120..e0a6898 100644
--- a/modules/darwin/vim/default.nix
+++ b/modules/darwin/vim/default.nix
@@ -9,14 +9,19 @@ with lib; let
in {
config = mkIf cfg.enable {
programs.vim.package =
- (pkgs.macvim.overrideAttrs (_: final: {
- # TODO https://github.com/NixOS/nixpkgs/pull/239842
- configureFlags =
- final.configureFlags
- ++ [
- "--disable-perlinterp"
- "--disable-rubyinterp"
- ];
+ (pkgs.macvim.overrideAttrs (_: _: {
+ # Too much of a hassle to selectively override this. Let's just
+ # explicitly override everything.
+ configureFlags = [
+ "--disable-luainterp"
+ "--disable-python3interp"
+ "--disable-sparkle"
+ "--enable-gui=macvim"
+ "--with-compiledby=Nix"
+ "--with-features=huge"
+ "--with-tlib=ncurses"
+ "--without-local-dir"
+ ];
}))
.configure (with cfg; {
customRC = rc;
diff --git a/modules/nixos/common/security.nix b/modules/nixos/common/security.nix
index 2272e12..c635cdc 100644
--- a/modules/nixos/common/security.nix
+++ b/modules/nixos/common/security.nix
@@ -1,5 +1,4 @@
-{lib, ...}:
-with lib; {
+_: {
security = {
sudo = {
enable = true;
@@ -26,6 +25,7 @@ with lib; {
'';
};
+ # Pretty much used only for PipeWire.
rtkit.enable = true;
};
}
diff --git a/modules/nixos/games/steam-run.nix b/modules/nixos/games/steam-run.nix
index 4540e3f..2643c95 100644
--- a/modules/nixos/games/steam-run.nix
+++ b/modules/nixos/games/steam-run.nix
@@ -11,6 +11,7 @@ in {
enable = mkEnableOption "native Steam runtime";
quirks = {
+ blackIsleStudios = mkEnableOption "fixes for games from Black Isle Studios";
cryptOfTheNecrodancer = mkEnableOption ''fixes for "Crypt of the NecroDancer" issues'';
mountAndBladeWarband = mkEnableOption ''fixes for "Mount & Blade: Warband" issues'';
};
@@ -30,7 +31,8 @@ in {
(steam.override {
extraLibraries = _:
with cfg.quirks;
- optionals cryptOfTheNecrodancer [
+ optional blackIsleStudios openssl_1_0_0
+ ++ optionals cryptOfTheNecrodancer [
(import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/d1c3fea7ecbed758168787fe4e4a3157e52bc808.tar.gz";
sha256 = "0ykm15a690v8lcqf2j899za3j6hak1rm3xixdxsx33nz7n3swsyy";
diff --git a/nixosConfigurations/default.nix b/nixosConfigurations/default.nix
index fe998cd..2fa32f9 100644
--- a/nixosConfigurations/default.nix
+++ b/nixosConfigurations/default.nix
@@ -34,9 +34,7 @@ with lib; let
isHeadful = false;
};
configuration = ./iso;
- modules = with inputs; [
- "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
- ];
+ modules = ["${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"];
};
mkTest = this: {
@@ -48,11 +46,9 @@ with lib; let
};
in
mapAttrs' mkConfiguration {
- # ISO images.
iso-arm = mkIso "aarch64-linux";
iso-x86 = mkIso "x86_64-linux";
- # Dummy configuration test profiles.
test-headless = mkTest {
hostname = "test-headless";
system = "x86_64-linux";
@@ -66,7 +62,6 @@ in
isHeadful = true;
};
- # A beefy desktop: 7950x/rx6750xt/128GB.
eonwe.modules = with inputs; [
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
@@ -75,14 +70,12 @@ in
nixpkgs.nixosModules.notDetected
];
- # ThinkPad T480.
melian.modules = with inputs; [
nixos-hardware.nixosModules.common-pc-laptop-ssd
nixos-hardware.nixosModules.lenovo-thinkpad-t480
nixpkgs.nixosModules.notDetected
];
- # VPS: Germany
manwe.modules = with inputs; [
"${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
nixos-hardware.nixosModules.common-cpu-amd
@@ -90,7 +83,6 @@ in
nixpkgs.nixosModules.notDetected
];
- # VPS: Germany
varda.modules = with inputs; [
"${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
nixos-hardware.nixosModules.common-cpu-amd
@@ -98,7 +90,6 @@ in
nixpkgs.nixosModules.notDetected
];
- # VPS: France
yavanna.modules = with inputs; [
"${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
nixos-hardware.nixosModules.common-cpu-intel
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 7a23ef0..21e4558 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -26,6 +26,7 @@ with lib; {
lutris.enable = true;
minecraft.client.enable = true;
steam.enable = true;
+ steam-run.quirks.blackIsleStudios = true;
};
libvirtd.enable = true;
mpd.enable = true;
diff --git a/packages/openssl_1_0_0.nix b/packages/openssl_1_0_0.nix
new file mode 100644
index 0000000..b1572d1
--- /dev/null
+++ b/packages/openssl_1_0_0.nix
@@ -0,0 +1,39 @@
+{
+ autoPatchelfHook,
+ fetchurl,
+ lib,
+ stdenvNoCC,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "openssl";
+ version = "1.0.0";
+
+ src = fetchurl {
+ url = "https://downloads.dotslashplay.it/resources/openssl/openssl_${finalAttrs.version}.tar.xz";
+ sha256 = "sha256-B8/FdkheAwrAtscn6dvUuen1slfRglM/kJb2xGm7uvA=";
+ };
+ sourceRoot = "x86_64";
+
+ nativeBuildInputs = [autoPatchelfHook];
+
+ dontPatch = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm555 -t $out/lib libcrypto.so.1.0.0
+ install -Dm555 -t $out/lib libssl.so.1.0.0
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Ancient OpenSSL version that some GOG games require";
+ homepage = "https://downloads.dotslashplay.it/resources/openssl";
+ license = licenses.asl20;
+ sourceProvenance = with lib.sourceTypes; [binaryBytecode];
+ maintainers = with maintainers; [azahi];
+ };
+})