Alexandre_1a/NixOSDots
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: Alexandre_1a:03c50a85045b2ba0f1f4e75eaf420d504e39d977
Branches Tags
Alexandre_1a:main
Alexandre_1a:experimental
..
compare: Alexandre_1a:619e6e82918772bf42e567e14d6cb4f35d6232f2
Branches Tags
Alexandre_1a:main
Alexandre_1a:experimental

No commits in common. "03c50a85045b2ba0f1f4e75eaf420d504e39d977" and "619e6e82918772bf42e567e14d6cb4f35d6232f2" have entirely different histories.
03c50a8504 ... 619e6e8291

6 changed files with 27 additions and 183 deletions
Show Stats Expand all files Collapse all files

167
flake.lock generated
View File

@ -55,38 +55,6 @@
"url": "https://codeberg.org/LGFae/awww" "url": "https://codeberg.org/LGFae/awww"
} }
}, },
"cachyos-kernel": {
"flake": false,
"locked": {
"lastModified": 1773637879,
"narHash": "sha256-hFKu2SaRoqt6+zbmcFW6A0AbBENIX8XooJLXQWa3sLc=",
"owner": "CachyOS",
"repo": "linux-cachyos",
"rev": "fa09a5bc69d3e7feeed9b1402c7df06c8170402a",
"type": "github"
},
"original": {
"owner": "CachyOS",
"repo": "linux-cachyos",
"type": "github"
}
},
"cachyos-kernel-patches": {
"flake": false,
"locked": {
"lastModified": 1773635524,
"narHash": "sha256-JErpxWTdoHq4JuDerfsbPA60FmWOxK4oX9UL9CcsP/Q=",
"owner": "CachyOS",
"repo": "kernel-patches",
"rev": "5544a0679fd6f6fb714e275514449c4ab9db2a53",
"type": "github"
},
"original": {
"owner": "CachyOS",
"repo": "kernel-patches",
"type": "github"
}
},
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1772080396, "lastModified": 1772080396,
@ -166,41 +134,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nix-citizen", "nix-citizen",
@ -221,9 +155,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1769996383,
@ -239,7 +173,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@ -262,7 +196,7 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"gitignore": "gitignore_3", "gitignore": "gitignore_3",
"nixpkgs": [ "nixpkgs": [
"nix-citizen", "nix-citizen",
@ -716,32 +650,9 @@
"type": "github" "type": "github"
} }
}, },
"nix-cachyos-kernel": {
"inputs": {
"cachyos-kernel": "cachyos-kernel",
"cachyos-kernel-patches": "cachyos-kernel-patches",
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1773804995,
"narHash": "sha256-LL6EG35pbxgjsqYIpwUnpHGDmKFYttE+BILBNhsEaJk=",
"owner": "xddxdd",
"repo": "nix-cachyos-kernel",
"rev": "3286b7ecf1d864e2be050af78aa633d4e3ae8fdb",
"type": "github"
},
"original": {
"owner": "xddxdd",
"ref": "release",
"repo": "nix-cachyos-kernel",
"type": "github"
}
},
"nix-citizen": { "nix-citizen": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": [ "nixpkgs": [
@ -787,7 +698,7 @@
}, },
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nixpkgs": [ "nixpkgs": [
"nix-citizen", "nix-citizen",
@ -846,52 +757,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1773738184,
"narHash": "sha256-zWRjT5oPabNCiC1A3QkFXpfnsgUjyg6fUZWC+IiiZH0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "41a2715cc472025a19bc0eb9dc4ee8b7406bfa6f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1773821835,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
@ -907,9 +772,24 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -1001,11 +881,10 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-cachyos-kernel": "nix-cachyos-kernel",
"nix-citizen": "nix-citizen", "nix-citizen": "nix-citizen",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"quickshell": "quickshell", "quickshell": "quickshell",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

4
flake.nix
View File

@ -12,10 +12,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Custom Kernel
nix-cachyos-kernel = {
url = "github:xddxdd/nix-cachyos-kernel/release";
};
# Hyprland # Hyprland
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";

1
hosts/framework/modules.nix
View File

@ -11,7 +11,6 @@ in
modules.nixos.secrets modules.nixos.secrets
modules.nixos.desktop.bluetooth modules.nixos.desktop.bluetooth
modules.nixos.desktop.utils modules.nixos.desktop.utils
modules.nixos.gaming.kernel
modules.nixos.gaming.amd modules.nixos.gaming.amd
modules.nixos.gaming.starCitizen modules.nixos.gaming.starCitizen
modules.nixos.gaming.steam modules.nixos.gaming.steam

6
modules/common/nix.nix
View File

@ -10,11 +10,11 @@
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
# Limit resource usage to prevent Linux OOM # Limit resource usage to prevent Linux OOM
max-jobs = 4; max-jobs = 2;
cores = 5; cores = 4;
max-silent-time = 3600; max-silent-time = 3600;
timeout = 2700; timeout = 1800;
# Package caches # Package caches
substituters = [ substituters = [

1
modules/default.nix
View File

@ -36,7 +36,6 @@
steam = ./nixos/gaming/steam.nix; steam = ./nixos/gaming/steam.nix;
vr = ./nixos/gaming/vr.nix; vr = ./nixos/gaming/vr.nix;
mod = ./nixos/gaming/mod.nix; mod = ./nixos/gaming/mod.nix;
kernel = ./nixos/gaming/kernel.nix;
}; };
bootloader = ./nixos/bootloader.nix; bootloader = ./nixos/bootloader.nix;

29
modules/nixos/gaming/kernel.nix
View File

@ -1,29 +0,0 @@
{ pkgs, inputs, lib, ... }:
let
helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel.outPath}/helpers.nix" {};
cachyKernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override {
cpusched = "bore";
lto = "thin";
processorOpt = "x86_64-v3";
hzTicks = "1000";
tickrate = "full";
preemptType = "full";
bbr3 = true;
ccHarder = true;
hugepage = "always";
};
in {
nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ];
boot.kernelPackages = helpers.kernelModuleLLVMOverride (
pkgs.linuxKernel.packagesFor cachyKernel
);
nix.settings = {
substituters = lib.mkAfter [
"https://attic.xuyh0120.win/lantian"
];
trusted-public-keys = lib.mkAfter [
"lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
];
};
}