21 Commits

Author SHA1 Message Date
c766b08973 remove full home config from iso
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 2m41s
2025-07-16 20:07:12 +02:00
27ca179697 update flake, sort system and home packages
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 7m42s
2025-07-15 16:12:16 +02:00
66b67b9b03 set kvmfr size to 128mb and change cleanup makefile rule
Some checks failed
Build iso when a new version is pushed / test (push) Has been cancelled
2025-07-15 12:37:05 +02:00
116e81d080 change specialisation name, blacklist xpad when in vfio mode
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 17m4s
2025-07-12 18:15:24 +02:00
e64579832a fix typo on laptop config
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 18m35s
2025-07-12 16:57:03 +02:00
11e350751a repair usb redirection on libvirt
Some checks failed
Build iso when a new version is pushed / test (push) Has been cancelled
2025-07-12 16:54:59 +02:00
d86380c995 add pin shortcut and add kvm windows gpu passthrough support in a specialisation config on laptop
Some checks failed
Build iso when a new version is pushed / test (push) Has been cancelled
2025-07-12 16:52:43 +02:00
79ad288bcc beta nvidia drivers on desktop
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 14m41s
2025-07-09 17:15:32 +02:00
5b3d74179b set virtualmanager as module, trying to fix nvidia stutter screens lag stutter, remove docker legacy version (latest probably fixed)
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 11m57s
2025-07-03 14:58:19 +02:00
ac2d3acf0e disable password auth on ssh and change nvidia drivers to beta
Some checks failed
Build iso when a new version is pushed / test (push) Has been cancelled
2025-06-28 00:45:51 +02:00
9d132e5366 update flake and change some ly settings
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 12m12s
2025-06-26 14:47:45 +02:00
8248d4b969 update flake, switch to kvm instead of virtualbox, add lrzip package
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 9m44s
2025-06-09 17:04:50 +02:00
18df257130 update flake
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 11m54s
2025-05-20 16:04:54 +02:00
c9ffd8a567 nodejs_23 doesn't exist in nixpkgs unsable anymore
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 15m52s
2025-05-16 00:19:28 +02:00
637f7e0d78 update flake
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 22s
2025-05-16 00:14:36 +02:00
4ff3ab574f change wallpaper on all configs instead of just laptop
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 9m18s
2025-05-12 12:35:54 +02:00
633eea8877 enable display manager on desktop
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 13m10s
2025-05-06 22:47:47 +02:00
3b7c49041c add git autocorrect
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 12m49s
2025-05-01 21:38:53 +02:00
e8fac6e226 add allow discard to cryptroot 2025-04-29 15:56:22 +02:00
3239948de6 change ffmpeg to ffmpeg-full nad add nv-codec-headers
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 21m41s
2025-04-27 16:36:28 +02:00
10c46e1e6a update flake
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 20m56s
2025-04-26 17:09:25 +02:00
18 changed files with 142 additions and 89 deletions

View File

@ -1,7 +1,7 @@
HOST ?= $(file < /etc/nixosFlakeName) HOST ?= $(file < /etc/nixosFlakeName)
THREADS ?= $(shell nproc) THREADS ?= $(shell nproc)
FLAKE ?= . FLAKE ?= .
MODE = switch MODE ?= boot
FLAGS = --impure --cores $(THREADS) -j $(THREADS) FLAGS = --impure --cores $(THREADS) -j $(THREADS)
@ -22,4 +22,5 @@ iso :
rm -rf result rm -rf result
cleanup : cleanup :
sudo nix-collect-garbage -d sudo nix-collect-garbage -d --delete-older-than 1d
nix-store --optimize -vv

24
flake.lock generated
View File

@ -8,11 +8,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1745222277, "lastModified": 1752552209,
"narHash": "sha256-zkUx4CzgqRS8bUT1hyEGol3w6/iv+tk0axMpdzTB7Mw=", "narHash": "sha256-qOU0Ntz0rczB8mtAXgrYywkeMGNOUZ7K1llhkXZ5IRE=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "da88304c0a5113485bd36a498ee05516cace8ec9", "rev": "a8e97c23cc97670e4ec9ab9fa43faf2585678de2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745256380, "lastModified": 1752467539,
"narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=", "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac", "rev": "1e54837569e0b80797c47be4720fab19e0db1616",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +44,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1744633460, "lastModified": 1752048960,
"narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744932701, "lastModified": 1752480373,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/17 18:15:38 by tomoron #+# #+# # # Created: 2024/10/17 18:15:38 by tomoron #+# #+# #
# Updated: 2025/04/25 00:08:54 by tomoron ### ########.fr # # Updated: 2025/05/12 12:35:00 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -66,7 +66,7 @@
home.file = { #should be able to make most of these in nix configs home.file = { #should be able to make most of these in nix configs
".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png; ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper_test.png;
".config/pc.jpg".source = lib.mkDefault utils/pc.jpg; ".config/pc.jpg".source = lib.mkDefault utils/pc.jpg;
".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\""; ".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";

View File

@ -20,7 +20,8 @@
"LIBVA_DRIVER_NAME,nvidia" "LIBVA_DRIVER_NAME,nvidia"
"__GLX_VENDOR_LIBRARY_NAME,nvidia" "__GLX_VENDOR_LIBRARY_NAME,nvidia"
]; ];
cursor.no_hardware_cursors = 1; cursor.no_hardware_cursors = true;
misc.vrr = 1;
}; };
mods.hyprland.autoSuspend = false; mods.hyprland.autoSuspend = false;

View File

@ -1,7 +1,6 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
home.file.".config/wallpaper.png".source = ../utils/wallpaper_test.png;
programs.waybar.settings.mainBar = { programs.waybar.settings.mainBar = {
modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"]; modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"];
"custom/dgpu" = { "custom/dgpu" = {

View File

@ -18,6 +18,7 @@
pull.rebase = true; pull.rebase = true;
push.autoSetupRemote = true; push.autoSetupRemote = true;
rerere.enabled = true; rerere.enabled = true;
help.autocorrect = 1;
}; };
aliases = { aliases = {
fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f"; fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";

View File

@ -18,7 +18,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
clang-tools clang-tools
nixd nixd
nodejs_23 nodejs_24
glsl_analyzer glsl_analyzer
]; ];

View File

@ -18,6 +18,7 @@
"CTRL_ALT, Q, killactive," "CTRL_ALT, Q, killactive,"
"SUPER_ALT, Q, exit," "SUPER_ALT, Q, exit,"
"$mainMod, S, togglefloating," "$mainMod, S, togglefloating,"
"$mainMod, I, pin,"
"$mainMod, D, exec, rofi -show drun -show-icons" "$mainMod, D, exec, rofi -show drun -show-icons"
"$mainMod, M, fullscreen, 1" "$mainMod, M, fullscreen, 1"
"$mainMod, F, fullscreen, 0" "$mainMod, F, fullscreen, 0"

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2025/02/10 00:21:11 by tomoron #+# #+# # # Created: 2025/02/10 00:21:11 by tomoron #+# #+# #
# Updated: 2025/02/12 09:36:07 by tomoron ### ########.fr # # Updated: 2025/06/18 15:49:03 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
{lib, config, ... }: {lib, config, ... }:
@ -34,7 +34,7 @@
setxkbmap fr us& setxkbmap fr us&
nitrogen --restore & nitrogen --restore &
pgrep activate-linux >/dev/null || (sleep 2;activate-linux -d)& pgrep activate-linux >/dev/null || (sleep 2;activate-linux -d)&
''; # this is messy but i don't care, x11 isn't my default now. ''; # this is messy but i don't care, x11 is just a fallback now
}; };
} }

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2025/02/09 22:01:56 by tomoron #+# #+# # # Created: 2025/02/09 22:01:56 by tomoron #+# #+# #
# Updated: 2025/04/15 15:58:07 by tomoron ### ########.fr # # Updated: 2025/07/15 16:10:34 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -14,20 +14,32 @@
{ {
home.packages = with pkgs;[ home.packages = with pkgs;[
lrzip
pigz
htop
gnumake
git
neofetch
neovim
clang
ninja
gdb
valgrind
wget
cmake
man-pages
stress
ffmpeg-full
ripgrep ripgrep
activate-linux activate-linux
unison unison
brightnessctl brightnessctl
playerctl playerctl
python3 python3
vlc vlc
nerd-fonts.iosevka
nix-index nix-index
yubikey-manager
yubico-pam
dunst dunst
yubikey-manager
bibata-cursors bibata-cursors
libcaca libcaca
nasm nasm

1
homeConfigs/result Symbolic link
View File

@ -0,0 +1 @@
/nix/store/ffxpgsp8bpdfab8kd0vnlpappy5s65ag-home-manager-generation

View File

@ -2,12 +2,7 @@
{ config, lib, inputs, pkgs, ... }: { config, lib, inputs, pkgs, ... }:
{ {
imports = [ boot.kernelParams = [ "nvidia-drm-modset=1" ];
../modules/game.nix
../modules/nvidia.nix
../modules/vboxHost.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cudatoolkit cudatoolkit
lm_sensors lm_sensors
@ -18,9 +13,10 @@
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;
boot.kernelModules = [ "kvm-intel" "nvidia" ]; boot.kernelModules = [ "kvm-intel" "nvidia" ];
mods.displayManager.enable = true;
hardware.nvidia = { hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.beta;
open = true; open = true;
prime.nvidiaBusId = "PCI:1:0:0"; prime.nvidiaBusId = "PCI:1:0:0";

View File

@ -13,13 +13,13 @@
services.getty.autologinUser = lib.mkForce "tom"; services.getty.autologinUser = lib.mkForce "tom";
services.getty.helpLine = lib.mkForce ""; services.getty.helpLine = lib.mkForce "";
programs.hyprland.enable = true; # programs.hyprland.enable = true;
home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;}; # home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
home-manager.users.tom = { # home-manager.users.tom = {
imports = [ # imports = [
../../homeConfigs/home.nix # ../../homeConfigs/home.nix
../../homeConfigs/hosts/iso.nix # ../../homeConfigs/hosts/iso.nix
]; # ];
}; # };
} }

View File

@ -1,18 +1,46 @@
{ pkgs, ... }: { config, pkgs, ... }:
{ {
boot.kernelParams = [ "kvm.enable_virt_at_load=0" ];
boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f"; boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
boot.initrd.luks.devices.cryptroot.allowDiscards = true;
services.displayManager.enable = true; mods.displayManager.enable = true;
services.displayManager.ly.enable = true; mods.virtualManager.enable = false;
networking.firewall.enable = false; networking.firewall.enable = false;
networking.hostName = "patate-douce"; networking.hostName = "patate-douce";
networking.wireless.enable = true; networking.wireless.enable = true;
networking.networkmanager.enable = false; networking.networkmanager.enable = false;
specialisation.vfio_ready.configuration = {
boot.kernel.sysctl."vm.nr_hugepages" = 5120;
boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ];
boot.kernelModules = [ "kvmfr" ];
boot.extraModprobeConfig = ''
options kvmfr static_size_mb=128
blacklist xpad
'';
virtualisation.libvirtd.qemu.verbatimConfig = ''
cgroup_device_acl = [
"/dev/kvmfr0", "/dev/null", "/dev/full", "/dev/zero",
"/dev/random", "/dev/urandom",
"/dev/ptmx", "/dev/kvm",
"/dev/rtc","/dev/hpet",
"/dev/input/by-id/[some_mouse_device]-event-mouse",
"/dev/input/by-id/[some_keyboard_device]-event-kbd"
]
'';
services.udev.extraRules = ''
SUBSYSTEM=="kvmfr", OWNER="tom", GROUP="kvm", MODE="0660"
'';
environment.systemPackages = with pkgs; [ looking-glass-client ];
};
programs.virt-manager.enable = true;
virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.runAsRoot = true;
virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
networking.dhcpcd.enable = false; networking.dhcpcd.enable = false;
systemd.network.enable = true; systemd.network.enable = true;
networking.useNetworkd = true; networking.useNetworkd = true;
@ -20,7 +48,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
acpi acpi
tlp tlp
looking-glass-client
fprintd fprintd
]; ];

View File

@ -12,6 +12,7 @@
networking.hostName = "server"; networking.hostName = "server";
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.settings.PasswordAuthentication = false;
services.openssh.ports = [ 1880 ]; services.openssh.ports = [ 1880 ];
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
@ -73,7 +74,7 @@
virtualisation.docker = { virtualisation.docker = {
liveRestore = false; liveRestore = false;
enableOnBoot = true; enableOnBoot = true;
package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker; # package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
# daemon.settings = { # daemon.settings = {
# runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime"; # runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
# exec-opts = ["native.cgroupdriver=cgroupfs"]; # exec-opts = ["native.cgroupdriver=cgroupfs"];
@ -87,6 +88,7 @@
hardware.nvidia-container-toolkit.enable = true; hardware.nvidia-container-toolkit.enable = true;
hardware.nvidia = { hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.beta;
open = true; open = true;
# prime.nvidiaBusId = "PCI:1:0:0"; # prime.nvidiaBusId = "PCI:1:0:0";

View File

@ -0,0 +1,21 @@
{config, lib, ... }:
{
options.mods.displayManager.enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = "enable the display manager";
};
config = lib.mkIf config.mods.displayManager.enable {
services.displayManager.enable = true;
services.displayManager.ly.enable = true;
services.displayManager.ly.settings =
{
sleep_cmd = "systemctl sleep";
asterisk = "A";
auth_fails= 3;
};
};
}

View File

@ -1,14 +1,19 @@
{ config, lib, inputs, pkgs, ... }: { config, lib, inputs, pkgs, ... }:
{ {
options.mods.virtualbox.enable = lib.mkOption { options.mods.virtualManager.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;
description = "enable virtualbox as host"; description = "enable virtual manager as host";
}; };
config = lib.mkIf config.mods.virtualbox.enable { config = lib.mkIf config.mods.virtualManager.enable {
virtualisation.virtualbox.host.enable = true; programs.virt-manager.enable = true;
users.users.tom.extraGroups = [ "vboxusers" ]; virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.runAsRoot = true;
virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
virtualisation.spiceUSBRedirection.enable = true;
environment.systemPackages = with pkgs; [ spice-gtk ];
}; };
} }

View File

@ -5,25 +5,11 @@
home-manager home-manager
vim vim
pciutils pciutils
pigz
htop
gnumake
git
neofetch
neovim
ntfs3g
clang
ninja
gdb
valgrind
wget
cmake
usbutils usbutils
man-pages ntfs3g
stress
ffmpeg
cryptsetup cryptsetup
acpi acpi
dconf nerd-fonts.iosevka
yubico-pam
]; ];
} }