blahai/nyx
1
0
Fork 0
mirror of https://github.com/blahai/nyx.git synced 2025-01-19 03:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: blahai:f23686bb4afb86d8f42a674ef61067abf4f1b036
Branches Tags
blahai:main
blahai:rewrite
..
compare: blahai:414cfd96dca0a9740e7cfe70ee627fd10d11ab3b
Branches Tags
blahai:main
blahai:rewrite

No commits in common. "f23686bb4afb86d8f42a674ef61067abf4f1b036" and "414cfd96dca0a9740e7cfe70ee627fd10d11ab3b" have entirely different histories.
f23686bb4a ... 414cfd96dc

6 changed files with 34 additions and 45 deletions
Show stats Expand all files Collapse all files

18
flake.lock
View file

@ -407,11 +407,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1734219437, "lastModified": 1734129402,
"narHash": "sha256-NVQIAvfSpBSJaJ4BP1cE1yVGjCuvXs0NN1G1t+f52Ss=", "narHash": "sha256-SSyk9SJ5Uu3/LhaoH2Bsgbx8fDgR6ZYQZG/13aNjL3M=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "db249648776875ce3142141d0d3055e43ce606aa", "rev": "3cba4ba44e7ba3cc8bb67ac71bc61245b5aca347",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -633,11 +633,11 @@
}, },
"nixpkgs-smol": { "nixpkgs-smol": {
"locked": { "locked": {
"lastModified": 1734187240, "lastModified": 1734143535,
"narHash": "sha256-I8cMXXWtf/+3DJT3QGm9BAp/b1oOCdKfgvpZ5XAUnp4=", "narHash": "sha256-YVchPYuRpCFWqx6EVA1V1CY0NCTI1d3fADjOlB6oYe0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "119bb2941c87b630c56b5e36b9ed63e3daa0e2d3", "rev": "6160d771fb09b838abefba72df27c0c32699fe45",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -750,11 +750,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1734221225, "lastModified": 1734172733,
"narHash": "sha256-PQtNGbg3B93+MINMe4/mwYWZkVDNzaf+O2Hw7xDznNk=", "narHash": "sha256-26j5mCeAIFmrTCbNyQq4H8Ikda+dX9+n6YJhHcZ6m6Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "12bcdb7c86a2598761a7e2ada1b1e6cd7542197c", "rev": "e06a083e1258845c7c8bcd5f4dcc2aab9964318c",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -99,12 +99,6 @@
}; };
epimetheus = nixpkgs.lib.nixosSystem { epimetheus = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
pkgs-smol = import nixpkgs-smol {
inherit system;
};
};
modules = modules =
[ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ]; [ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ];
}; };

9
hosts/epimetheus/configuration.nix
View file

@ -1,14 +1,9 @@
{ pkgs, pkgs-smol, lib, modulesPath, config, ... }: { { pkgs, lib, modulesPath, config, ... }: {
imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ]; imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
boot = { boot = {
supportedFilesystems = [ "zfs" ]; kernelPackages = pkgs.linuxPackages_6_12;
zfs = {
forceImportRoot = false;
package = pkgs-smol.zfs;
};
kernelPackages = pkgs-smol.linuxPackages_6_12;
kernelParams = lib.mkAfter [ "noquiet" "toram" ]; kernelParams = lib.mkAfter [ "noquiet" "toram" ];
enableContainers = false; enableContainers = false;
}; };

12
hosts/nyx/configuration.nix
View file

@ -18,12 +18,12 @@
}; };
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
supportedFilesystems = [ "zfs" ]; #supportedFilesystems = [ "zfs" ];
zfs = { #zfs = {
forceImportRoot = false; # forceImportRoot = false;
package = pkgs-smol.zfs; # package = pkgs.zfs;
}; #};
kernelPackages = pkgs-smol.linuxPackages_6_12; kernelPackages = pkgs.linuxPackages_6_12;
kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; }; kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; };
}; };

9
hosts/theia/configuration.nix
View file

@ -20,10 +20,6 @@
kernel = { kernel = {
sysctl = { sysctl = {
"vm.max_map_count" = 2147483642; "vm.max_map_count" = 2147483642;
"vm.swappiness" = 200;
"vm.watermark_boost_factor" = 0;
"vm.watermark_scale_factor" = 125;
"vm.page-cluster" = 0;
"net.ipv4.ip_forward" = 1; "net.ipv4.ip_forward" = 1;
"net.ipv6.conf.all.forwarding" = 1; "net.ipv6.conf.all.forwarding" = 1;
}; };
@ -61,11 +57,6 @@
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = [{
device = "/var/lib/swapfile";
size = 16 * 1024;
}];
networking = { networking = {
enableIPv6 = false; # Had to disable for now due to problems with resolving enableIPv6 = false; # Had to disable for now due to problems with resolving
firewall = { firewall = {

9
modules/home-manager/cli/fish/default.nix
View file

@ -59,10 +59,13 @@
functions = { functions = {
os-age = '' os-age = ''
function os-age
stat / | awk '/Birth: /{print $2 " " substr($3,1,5)}' stat / | awk '/Birth: /{print $2 " " substr($3,1,5)}'
end
''; '';
build-iso = '' build-iso = ''
function build-iso
cd ~/.config/nixos cd ~/.config/nixos
nix build .#nixosConfigurations.epimetheus.config.system.build.isoImage nix build .#nixosConfigurations.epimetheus.config.system.build.isoImage
''; '';
@ -70,15 +73,21 @@
# Credit for these 3 # Credit for these 3
# https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn # https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn
disks = '' disks = ''
function disks
lsblk -o NAME,MOUNTPOINT,FSTYPE,FSUSE%,SIZE lsblk -o NAME,MOUNTPOINT,FSTYPE,FSUSE%,SIZE
end
''; '';
gr = '' gr = ''
function gr
set GROOT (git rev-parse --show-toplevel 2>/dev/null); and cd $GROOT; or return $argv set GROOT (git rev-parse --show-toplevel 2>/dev/null); and cd $GROOT; or return $argv
end
''; '';
mkcd = '' mkcd = ''
function mkcd
mkdir -p -- $argv[1] && cd $argv; or return $status mkdir -p -- $argv[1] && cd $argv; or return $status
end
''; '';
}; };