alteur/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactored

Browse source
This commit is contained in:
alsaiduq-lab 2025-06-04 10:14:57 -06:00
parent cc87e2cb60
commit 66dc310ab2
7 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -47,11 +47,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748656608, "lastModified": 1749002293,
"narHash": "sha256-VU+8/kZ57Y7XTmgMBpybGMxO/elvUn/4yMndZji2pY8=", "narHash": "sha256-86wVDHBgO7VEalk2VU/3k02pe+/0cycSOS0+3V0aKjI=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "b585487bb87faec1c7a09aada7cfe77dd7b3c5fe", "rev": "a5f39e82c1c4c57e87b5c498dd3d0825db297398",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748437600, "lastModified": 1748889542,
"narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +102,11 @@
"rpcs3_latest": { "rpcs3_latest": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748720164, "lastModified": 1748980799,
"narHash": "sha256-MaQWMp4V92c1mszgqvrbcbAOaqhZLqj75i8950PwNLI=", "narHash": "sha256-NS0AnmYO8EyvrmJEBz/BtyIyjLYpOJpLpYxWfHsZTWs=",
"owner": "RPCS3", "owner": "RPCS3",
"repo": "rpcs3", "repo": "rpcs3",
"rev": "c437fe9ff052f69c3d151a98e22cd77d3d9e013e", "rev": "d15b7a995588561d64ce0cd250038f0757be3417",
"type": "github" "type": "github"
}, },
"original": { "original": {

27
flake.nix
View file

@ -1,5 +1,6 @@
{ {
description = "NixOS configuration for Cobray"; description = "NixOS configuration for Cobray";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
home-manager = { home-manager = {
@ -15,6 +16,7 @@
flake = false; flake = false;
}; };
}; };
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
@ -25,7 +27,6 @@
} @ inputs: let } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
customFontPkgs = import "${self}/pkgs/fonts" {inherit pkgs;};
customPkgs = import "${self}/pkgs" { customPkgs = import "${self}/pkgs" {
inherit pkgs; inherit pkgs;
lib = nixpkgs.lib; lib = nixpkgs.lib;
@ -34,26 +35,34 @@
in { in {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {inherit inputs;};
inherit inputs customPkgs;
lib = nixpkgs.lib;
};
modules = [ modules = [
{ {
nixpkgs.config.allowUnfree = true; nixpkgs = {
nixpkgs.overlays = [ config = {
allowUnfree = true;
allowAliases = true;
};
hostPlatform = system;
overlays = [
(final: prev: { (final: prev: {
inherit inherit
(customPkgs) (customPkgs)
fish-rust fish-rust
pugixml pugixml
SDL3 SDL3
rpcs3
rpcs3_latest rpcs3_latest
clear-sans clear-sans
binary-font binary-font
; ;
}) })
(final: prev: {
clear-sans = prev.clear-sans.clear-sans;
binary-font = prev.binary-font.binary-clock-font;
})
]; ];
};
} }
./hosts/configuration.nix ./hosts/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -61,9 +70,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {inherit inputs;};
inherit inputs customPkgs;
};
users.cobray = import ./home-manager/cobray.nix; users.cobray = import ./home-manager/cobray.nix;
}; };
} }

4
modules/fonts.nix
View file

@ -6,8 +6,8 @@
noto-fonts-cjk-serif noto-fonts-cjk-serif
noto-fonts-emoji noto-fonts-emoji
nerd-fonts._0xproto nerd-fonts._0xproto
nerd-fonts-noto nerd-fonts.noto
nerd-fonts-symbols-only nerd-fonts.symbols-only
ipafont ipafont
kochi-substitute kochi-substitute
clear-sans clear-sans

2
pkgs/binary-font/default.nix
View file

@ -3,7 +3,7 @@
lib, lib,
... ...
}: { }: {
binary-clock-font = pkgs.stden.mkDerivation { binary-clock-font = pkgs.stdenv.mkDerivation {
pname = "binary-clock-font"; pname = "binary-clock-font";
version = "1.0.0"; version = "1.0.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {

2
pkgs/clear-sans/default.nix
View file

@ -18,7 +18,7 @@
meta = with lib; { meta = with lib; {
description = "Clear Sans font"; description = "Clear Sans font";
homepage = "https://github.com/intel/clear-sans"; homepage = "https://github.com/intel/clear-sans";
license = licenses.apache; license = licenses.asl20;
maintainers = [cobray]; maintainers = [cobray];
platforms = platforms.all; platforms = platforms.all;
}; };

3
pkgs/default.nix
View file

@ -10,5 +10,6 @@
in { in {
inherit (rpcs3Pkgs) pugixml SDL3 rpcs3 rpcs3_latest; inherit (rpcs3Pkgs) pugixml SDL3 rpcs3 rpcs3_latest;
fish-rust = pkgs.callPackage ./fish-rust {}; fish-rust = pkgs.callPackage ./fish-rust {};
inherit (customFontPkgs) clear-sans binary-font; clear-sans = pkgs.callPackage ./clear-sans {};
binary-font = pkgs.callPackage ./binary-font {};
} }

2
pkgs/rpcs3/default.nix
View file

@ -37,7 +37,7 @@
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/RPCS3/rpcs3.git"; url = "https://github.com/RPCS3/rpcs3.git";
rev = rpcs3_latest.rev; rev = rpcs3_latest.rev;
sha256 = "sha256-l7ewWWbFWaziBGrWUMdmSn79tq1Sumnqvjcqr1LYfhU="; sha256 = "sha256-WTb2FHR46qirndxQLcs7k7GPDTTSXb39ydtzuxCe17k=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = []; patches = [];