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;
}
);
in
{
in {
packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
formatter = forEachSystem (pkgs: pkgs.alejandra);
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’
# and may be overwritten by future invocations. Please make changes
# 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.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{
fileSystems."/" = {
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs";
options = ["subvol=root" "compress=zstd"];
@ -18,37 +21,35 @@
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";
fsType = "btrfs";
options = ["subvol=home" "compress=zstd"];
};
fileSystems."/nix" =
{
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs";
options = ["subvol=nix" "compress=zstd" "noatime"];
};
fileSystems."/swap" =
{
fileSystems."/swap" = {
device = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
fsType = "btrfs";
options = ["subvol=swap"];
};
fileSystems."/boot" =
{
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/29B7-F46D";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
swapDevices = [{
swapDevices = [
{
device = "/swap/swapfile";
}];
}
];
boot.resumeDevice = "/dev/disk/by-uuid/17870658-6118-46af-837f-70c9175e09c3";
boot.kernelParams = ["resume_offset=53224704"];

View file

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