This commit is contained in:
cy 2024-12-13 11:28:27 -05:00
parent f5bc46061b
commit 7ca1fb1b89
5 changed files with 136 additions and 137 deletions

View file

@ -32,8 +32,7 @@
config.allowUnfree = true; config.allowUnfree = true;
} }
); );
in in {
{
packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;}); packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
formatter = forEachSystem (pkgs: pkgs.alejandra); formatter = forEachSystem (pkgs: pkgs.alejandra);
devShells = forEachSystem (pkgs: import ./shells {inherit pkgs;}); devShells = forEachSystem (pkgs: import ./shells {inherit pkgs;});

View file

@ -1,16 +1,19 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
config,
lib,
pkgs,
modulesPath,
...
}: {
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3"; device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=root" "compress=zstd"]; options = ["subvol=root" "compress=zstd"];
@ -18,37 +21,35 @@
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/c6098a16-c8a6-4a97-8648-6f46ca919d13"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/c6098a16-c8a6-4a97-8648-6f46ca919d13";
fileSystems."/home" = fileSystems."/home" = {
{
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3"; device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=home" "compress=zstd"]; options = ["subvol=home" "compress=zstd"];
}; };
fileSystems."/nix" = fileSystems."/nix" = {
{
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3"; device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nix" "compress=zstd" "noatime"]; options = ["subvol=nix" "compress=zstd" "noatime"];
}; };
fileSystems."/swap" = fileSystems."/swap" = {
{
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3"; device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=swap"]; options = ["subvol=swap"];
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{
device = "/dev/disk/by-uuid/29B7-F46D"; device = "/dev/disk/by-uuid/29B7-F46D";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
}; };
swapDevices = [{ swapDevices = [
{
device = "/swap/swapfile"; device = "/swap/swapfile";
}]; }
];
boot.resumeDevice = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3"; boot.resumeDevice = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
boot.kernelParams = ["resume_offset=53224704"]; boot.kernelParams = ["resume_offset=53224704"];

View file

@ -1,18 +1,16 @@
{ fetchurl {
, stdenv fetchurl,
, lib stdenv,
, buildFHSEnv lib,
, appimageTools buildFHSEnv,
, writeShellScript appimageTools,
, anki writeShellScript,
, undmg anki,
, zstd undmg,
, cacert zstd,
, commandLineArgs ? [ ] cacert,
, commandLineArgs ? [],
}: }: let
let
pname = "anki-bin"; pname = "anki-bin";
# Update hashes for both Linux and Darwin! # Update hashes for both Linux and Darwin!
version = "24.11"; version = "24.11";
@ -55,7 +53,8 @@ let
}; };
meta = with lib; { meta = with lib; {
inherit (anki.meta) inherit
(anki.meta)
license license
homepage homepage
description description
@ -87,9 +86,7 @@ let
''; '';
# Dependencies of anki # Dependencies of anki
targetPkgs = targetPkgs = pkgs: (with pkgs; [
pkgs:
(with pkgs; [
xorg.libxkbfile xorg.libxkbfile
xcb-util-cursor-HEAD xcb-util-cursor-HEAD
krb5 krb5
@ -114,14 +111,16 @@ let
} }
); );
in in
if stdenv.hostPlatform.isLinux
if stdenv.hostPlatform.isLinux then then fhsEnvAnki
fhsEnvAnki
else else
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version passthru; inherit pname version passthru;
src = if stdenv.hostPlatform.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; src =
if stdenv.hostPlatform.isAarch64
then sources.darwin-aarch64
else sources.darwin-x86_64;
nativeBuildInputs = [undmg]; nativeBuildInputs = [undmg];
sourceRoot = "."; sourceRoot = ".";