Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
e64579832a | |||
11e350751a | |||
d86380c995 | |||
79ad288bcc | |||
5b3d74179b | |||
ac2d3acf0e | |||
9d132e5366 | |||
8248d4b969 | |||
18df257130 | |||
c9ffd8a567 | |||
637f7e0d78 | |||
4ff3ab574f | |||
633eea8877 | |||
3b7c49041c | |||
e8fac6e226 | |||
3239948de6 | |||
10c46e1e6a |
2
Makefile
2
Makefile
@ -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)
|
||||||
|
|
||||||
|
24
flake.lock
generated
24
flake.lock
generated
@ -8,11 +8,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1745222277,
|
"lastModified": 1750651402,
|
||||||
"narHash": "sha256-zkUx4CzgqRS8bUT1hyEGol3w6/iv+tk0axMpdzTB7Mw=",
|
"narHash": "sha256-mT97WT4FlJyvfWp7rso3tUZca0qKU46czyi/HBJHG4w=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "da88304c0a5113485bd36a498ee05516cace8ec9",
|
"rev": "13fa5e2e89062281dee88508f97e93360bfe2e2d",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -29,11 +29,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745256380,
|
"lastModified": 1750690749,
|
||||||
"narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=",
|
"narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac",
|
"rev": "05b8c9506452349d8be854ac46e5a7630fa7917d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -44,11 +44,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744633460,
|
"lastModified": 1750431636,
|
||||||
"narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
|
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
|
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -60,11 +60,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744932701,
|
"lastModified": 1750506804,
|
||||||
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
|
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
|
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -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\"";
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -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" = {
|
||||||
|
@ -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";
|
||||||
|
@ -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
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
@ -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
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
1
homeConfigs/result
Symbolic link
1
homeConfigs/result
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
/nix/store/ffxpgsp8bpdfab8kd0vnlpappy5s65ag-home-manager-generation
|
@ -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";
|
||||||
|
@ -1,18 +1,45 @@
|
|||||||
{ 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.hugepage_ram.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=32
|
||||||
|
'';
|
||||||
|
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 +47,6 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
acpi
|
acpi
|
||||||
tlp
|
tlp
|
||||||
looking-glass-client
|
|
||||||
fprintd
|
fprintd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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";
|
||||||
|
21
osConfigs/modules/displayManager.nix
Normal file
21
osConfigs/modules/displayManager.nix
Normal 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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -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 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
lrzip
|
||||||
home-manager
|
home-manager
|
||||||
vim
|
vim
|
||||||
pciutils
|
pciutils
|
||||||
@ -21,9 +22,11 @@
|
|||||||
usbutils
|
usbutils
|
||||||
man-pages
|
man-pages
|
||||||
stress
|
stress
|
||||||
ffmpeg
|
|
||||||
cryptsetup
|
cryptsetup
|
||||||
acpi
|
acpi
|
||||||
dconf
|
dconf
|
||||||
|
|
||||||
|
ffmpeg-full
|
||||||
|
nv-codec-headers
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user