Compare commits
No commits in common. "fa5323584250be24b47236eb2875689ab735a3fb" and "82f1d9d5c92d24ee0d47fb3e50308d4cbcb39299" have entirely different histories.
fa53235842
...
82f1d9d5c9
7 changed files with 17 additions and 149 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,2 +0,0 @@
|
||||||
result
|
|
||||||
result-*
|
|
||||||
30
flake.lock
generated
30
flake.lock
generated
|
|
@ -22,11 +22,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758287904,
|
"lastModified": 1757508292,
|
||||||
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
|
"narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
|
"rev": "146f45bee02b8bd88812cfce6ffc0f933788875a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -101,11 +101,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760130406,
|
"lastModified": 1749499854,
|
||||||
"narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
|
"narHash": "sha256-V1BgwiX8NjbRreU6LC2EzmuqFSQAHhoSeNlYJyZ40NE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
|
"rev": "1df816c407d3a5090c8496c9b00170af7891f021",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -142,11 +142,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760106635,
|
"lastModified": 1749195551,
|
||||||
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
|
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
|
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -157,11 +157,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760038930,
|
"lastModified": 1749285348,
|
||||||
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
|
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
|
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -252,11 +252,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759635238,
|
"lastModified": 1747603214,
|
||||||
"narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
|
"narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
|
"rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
10
flake.nix
10
flake.nix
|
|
@ -11,20 +11,15 @@
|
||||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
disko.url = "github:nix-community/disko";
|
disko.url = "github:nix-community/disko";
|
||||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
stylix.url = "github:nix-community/stylix";
|
|
||||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
# https://nix.dev/tutorials/nix-language.html#named-attribute-set-argument
|
# https://nix.dev/tutorials/nix-language.html#named-attribute-set-argument
|
||||||
outputs = inputs@{self, nixpkgs, nixos-hardware, home-manager, sops-nix, lanzaboote, disko, stylix, ...}:
|
outputs = inputs@{self, nixpkgs, nixos-hardware, home-manager, sops-nix, lanzaboote, disko, ...}:
|
||||||
let
|
let
|
||||||
mkSystem = (import ./lib {
|
mkSystem = (import ./lib {
|
||||||
inherit nixpkgs home-manager inputs;
|
inherit nixpkgs home-manager inputs;
|
||||||
}).mkSystem;
|
}).mkSystem;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
lib = {
|
|
||||||
mkSystem = mkSystem;
|
|
||||||
};
|
|
||||||
# NOTE: Run `nix flake show` to see what this flake has to offer.
|
# NOTE: Run `nix flake show` to see what this flake has to offer.
|
||||||
# TODO: Enable automated formatting with something like numtide/treefmt-nix
|
# TODO: Enable automated formatting with something like numtide/treefmt-nix
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
|
@ -45,8 +40,7 @@
|
||||||
users = [
|
users = [
|
||||||
"jml"
|
"jml"
|
||||||
];
|
];
|
||||||
#extraModules = [ (import ./overlays) ];
|
extraModules = [];
|
||||||
extraModules = [ stylix.nixosModules.stylix ];
|
|
||||||
};
|
};
|
||||||
# `nix build .#nixosConfigurations.installIso.config.system.build.isoImage`
|
# `nix build .#nixosConfigurations.installIso.config.system.build.isoImage`
|
||||||
# https://github.com/nix-community/nixos-generators
|
# https://github.com/nix-community/nixos-generators
|
||||||
|
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
retroarchWithCores = (
|
|
||||||
pkgs.retroarch.withCores (
|
|
||||||
cores: with cores; [
|
|
||||||
# Multi-Emulators
|
|
||||||
mame # Atari / Nintendo / Sega / etc.
|
|
||||||
|
|
||||||
# Sega
|
|
||||||
genesis-plus-gx # Sega Genesis
|
|
||||||
|
|
||||||
# Nintendo
|
|
||||||
mesen # NES
|
|
||||||
bsnes # Super Nintendo
|
|
||||||
mupen64plus # Nintendo 64 - Maybe simple64 some day.
|
|
||||||
dolphin # GameCube
|
|
||||||
mgba # GameBoy / Color / Advance
|
|
||||||
melonds # Nintendo DS
|
|
||||||
citra # Nintendo 3DS
|
|
||||||
|
|
||||||
|
|
||||||
# Sony
|
|
||||||
swanstation #duckstation # PlayStation
|
|
||||||
beetle-psx-hw
|
|
||||||
pcsx2 # PlayStation 2 -- Is actually "LRPS2"
|
|
||||||
#rpcs3 # PlayStation 3
|
|
||||||
ppsspp # PlayStation Portable
|
|
||||||
|
|
||||||
# Commodore
|
|
||||||
vice-x64 # C64
|
|
||||||
]
|
|
||||||
)
|
|
||||||
);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
retroarchWithCores
|
|
||||||
#pkgs.emulationstation-de
|
|
||||||
pkgs.gnome-bluetooth
|
|
||||||
];
|
|
||||||
|
|
||||||
hardware.xone.enable = true; # Xbox Controller Driver
|
|
||||||
hardware.enableAllFirmware = true;
|
|
||||||
hardware.bluetooth = {
|
|
||||||
enable = true;
|
|
||||||
powerOnBoot = true;
|
|
||||||
settings = {
|
|
||||||
General = {
|
|
||||||
Experimental = true;
|
|
||||||
FastConnectable = true;
|
|
||||||
};
|
|
||||||
Policy = {
|
|
||||||
AutoEnable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
imports = [];
|
|
||||||
|
|
||||||
options = {
|
|
||||||
zw-calibre = {
|
|
||||||
enable = lib.mkEnableOption "Enable Calibre";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
config.allowUnfreePredigate = pkg: builtins.elem (lib.getName pkg) [
|
|
||||||
"calibre"
|
|
||||||
"unrar"
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
(calibre.override {
|
|
||||||
unrarSupport = true;
|
|
||||||
})
|
|
||||||
unrar
|
|
||||||
];
|
|
||||||
|
|
||||||
services.udisks2.enable = true;
|
|
||||||
};
|
|
||||||
# NOTE: Consider adding https://github.com/nydragon/calibre-plugins
|
|
||||||
}
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
{ nixpkgs }:
|
|
||||||
let
|
|
||||||
fixCmake = pkg: pkg.overrideAttrs (old: {
|
|
||||||
cmakeFlakes = (old.cmakeFlags or []) ++ [
|
|
||||||
(nixpkgs.lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
|
|
||||||
];
|
|
||||||
});
|
|
||||||
cmake3Overlay = final: prev:
|
|
||||||
nixpkgs.lib.mapAttrs (
|
|
||||||
n: pkg:
|
|
||||||
pkg.overrideAttrs (old: {
|
|
||||||
cmakeFlags = old.cmakeFlags or [ ] ++ [ (nixpkgs.lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
|
|
||||||
})
|
|
||||||
) {
|
|
||||||
inherit (prev) hpipm;
|
|
||||||
};
|
|
||||||
libretroCmake3Overlay = final: prev: {
|
|
||||||
libretro = prev.libretro // {
|
|
||||||
thepowdertoy = prev.libretro.thepowdertoy.overrideAttrs(old: {
|
|
||||||
cmakeFlags = old.cmakeFlags or [ ] ++ [ (nixpkgs.lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
|
|
||||||
});
|
|
||||||
|
|
||||||
tic80 = prev.libretro.tic80.overrideAttrs(old: {
|
|
||||||
cmakeFlags = old.cmakeFlags or [ ] ++ [ (nixpkgs.lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
|
|
||||||
});
|
|
||||||
|
|
||||||
citra = prev.libretro.citra.overrideAttrs(old: {
|
|
||||||
cmakeFlags = old.cmakeFlags or [ ] ++ [ (nixpkgs.lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
|
|
||||||
});
|
|
||||||
|
|
||||||
dolphin = prev.libretro.dolphin.overrideAttrs(old: {
|
|
||||||
cmakeFlags = old.cmakeFlags or [ ] ++ [ (nixpkgs.lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
[
|
|
||||||
cmake3Overlay
|
|
||||||
libretroCmake3Overlay
|
|
||||||
]
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue