Compare commits
1 Commits
c766b08
...
new-42-hom
Author | SHA1 | Date | |
---|---|---|---|
34e087b815 |
@ -1,9 +1,6 @@
|
|||||||
name: Build iso when a new version is pushed
|
name: Build iso when a new version is pushed
|
||||||
run-name: iso building
|
run-name: iso building
|
||||||
on:
|
on: [push]
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'master'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@ -11,50 +8,13 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: get repo
|
- name: get repo
|
||||||
uses: actions/checkout@v4.2.2
|
uses: actions/checkout@v4.2.2
|
||||||
|
# - uses: https://github.com/cachix/install-nix-action@v31
|
||||||
- name: install nix
|
# - name: create iso image
|
||||||
uses: https://github.com/cachix/install-nix-action@v31
|
# run: make iso
|
||||||
|
|
||||||
- name: install go
|
|
||||||
uses: https://github.com/actions/setup-go@v4
|
|
||||||
with:
|
|
||||||
go-version: '>=1.20.1'
|
|
||||||
|
|
||||||
- name: build iso
|
|
||||||
run: make iso
|
|
||||||
|
|
||||||
- name: get commit tag
|
|
||||||
id: vars
|
|
||||||
run: echo "TAG=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: create tag
|
|
||||||
run: |
|
|
||||||
git config user.name "gitea-actions"
|
|
||||||
git config user.email "actions@gitea.com"
|
|
||||||
git tag ${{steps.vars.outputs.TAG}}
|
|
||||||
git push origin ${{steps.vars.outputs.TAG}}
|
|
||||||
|
|
||||||
- name: create release
|
- name: create release
|
||||||
run: |
|
uses: https://gitea.com/actions/release-action@main
|
||||||
AUTH_TOKEN=${{secrets.RELEASE_TOKEN}}
|
with:
|
||||||
TAG_NAME=${{steps.vars.outputs.TAG}}
|
files: |-
|
||||||
owner=tom
|
nixos.iso
|
||||||
repo=nix-config
|
api_key: '${{secrets.RELEASE_TOKEN}}'
|
||||||
set -e
|
|
||||||
release_create_res=$(curl -X POST -H "Authorization: token $AUTH_TOKEN" -H "content-type: application/json" -d "{\"tag_name\":\"$TAG_NAME\",\"name\":\"$TAG_NAME\"}" "https://git.tmoron.fr/api/v1/repos/$owner/$repo/releases" 2>/dev/null)
|
|
||||||
|
|
||||||
release_id=$(echo $release_create_res | jq -r .id)
|
|
||||||
echo $release_id
|
|
||||||
|
|
||||||
if [ $release_id == "null" ]; then
|
|
||||||
echo error
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
file_send_res=$(curl \
|
|
||||||
"https://git.tmoron.fr/api/v1/repos/$owner/$repo/releases/$release_id/assets?name=nixos.iso"\
|
|
||||||
-H "Authorization: token $AUTH_TOKEN"\
|
|
||||||
-H "accept: application/json"\
|
|
||||||
-H "Content-Type: multipart/form-data"\
|
|
||||||
-F "attachment=@nixos.iso" 2>/dev/null)
|
|
||||||
echo $file_send_res
|
|
||||||
|
5
Makefile
5
Makefile
@ -1,7 +1,7 @@
|
|||||||
HOST ?= $(file < /etc/nixosFlakeName)
|
HOST ?= $(file < /etc/nixosFlakeName)
|
||||||
THREADS ?= $(shell nproc)
|
THREADS ?= $(shell nproc)
|
||||||
FLAKE ?= .
|
FLAKE ?= .
|
||||||
MODE ?= boot
|
MODE = boot
|
||||||
|
|
||||||
FLAGS = --impure --cores $(THREADS) -j $(THREADS)
|
FLAGS = --impure --cores $(THREADS) -j $(THREADS)
|
||||||
|
|
||||||
@ -22,5 +22,4 @@ iso :
|
|||||||
rm -rf result
|
rm -rf result
|
||||||
|
|
||||||
cleanup :
|
cleanup :
|
||||||
sudo nix-collect-garbage -d --delete-older-than 1d
|
sudo nix-collect-garbage -d
|
||||||
nix-store --optimize -vv
|
|
||||||
|
57
flake.lock
generated
57
flake.lock
generated
@ -2,17 +2,18 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"firefox-addons": {
|
"firefox-addons": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1752552209,
|
"lastModified": 1743119709,
|
||||||
"narHash": "sha256-qOU0Ntz0rczB8mtAXgrYywkeMGNOUZ7K1llhkXZ5IRE=",
|
"narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "a8e97c23cc97670e4ec9ab9fa43faf2585678de2",
|
"rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -22,6 +23,21 @@
|
|||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1629284811,
|
||||||
|
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -29,11 +45,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752467539,
|
"lastModified": 1743345555,
|
||||||
"narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=",
|
"narHash": "sha256-Df8PxfWYF/z6RWcsKuXSks/FOCOCA7EiRdlWE2u0rRc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1e54837569e0b80797c47be4720fab19e0db1616",
|
"rev": "2760046f34780cc72f67e06240ccf6a7a3ae3765",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -44,11 +60,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752048960,
|
"lastModified": 1743167577,
|
||||||
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
|
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
|
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -60,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752480373,
|
"lastModified": 1743095683,
|
||||||
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
|
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
|
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -74,22 +90,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pkgs-docker-2750": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1737525964,
|
|
||||||
"narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plymouth-theme-ycontre-glow": {
|
"plymouth-theme-ycontre-glow": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -116,7 +116,6 @@
|
|||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"pkgs-docker-2750": "pkgs-docker-2750",
|
|
||||||
"plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
|
"plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2024/10/17 18:15:24 by tomoron #+# #+# #
|
# Created: 2024/10/17 18:15:24 by tomoron #+# #+# #
|
||||||
# Updated: 2025/04/13 13:35:56 by tomoron ### ########.fr #
|
# Updated: 2025/03/19 15:48:10 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -30,7 +30,6 @@
|
|||||||
url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
|
url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:
|
outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:
|
||||||
@ -76,7 +75,7 @@
|
|||||||
|
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
vbox = homeConfig { flakeName = "vbox"; };
|
vbox = homeConfig { flakeName = "vbox"; };
|
||||||
ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/nfs/homes/tomoron";};
|
ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";};
|
||||||
laptop = homeConfig { flakeName = "laptop"; };
|
laptop = homeConfig { flakeName = "laptop"; };
|
||||||
desktop = homeConfig { flakeName = "desktop"; };
|
desktop = homeConfig { flakeName = "desktop"; };
|
||||||
server = homeConfig { flakeName = "server"; };
|
server = homeConfig { flakeName = "server"; };
|
||||||
|
@ -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/05/12 12:35:00 by tomoron ### ########.fr #
|
# Updated: 2025/03/19 15:45:13 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -64,11 +64,9 @@
|
|||||||
|
|
||||||
home.sessionPath = [ "~/.local/bin" ];
|
home.sessionPath = [ "~/.local/bin" ];
|
||||||
|
|
||||||
|
|
||||||
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_test.png;
|
".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.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\"";
|
|
||||||
|
|
||||||
".local/share/rofi/themes".source = "${builtins.fetchGit {
|
".local/share/rofi/themes".source = "${builtins.fetchGit {
|
||||||
url = "https://github.com/newmanls/rofi-themes-collection";
|
url = "https://github.com/newmanls/rofi-themes-collection";
|
||||||
|
@ -20,8 +20,7 @@
|
|||||||
"LIBVA_DRIVER_NAME,nvidia"
|
"LIBVA_DRIVER_NAME,nvidia"
|
||||||
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
|
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
|
||||||
];
|
];
|
||||||
cursor.no_hardware_cursors = true;
|
cursor.no_hardware_cursors = 1;
|
||||||
misc.vrr = 1;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mods.hyprland.autoSuspend = false;
|
mods.hyprland.autoSuspend = false;
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
mods.x11.enable = true;
|
mods.x11.enable = true;
|
||||||
programs.firefox.enable = false;
|
programs.firefox.enable = false;
|
||||||
|
|
||||||
mods.sync.homeFolder = "/sgoinfre/goinfre/Perso/tomoron";
|
mods.sync.homeFolder = "/home/tomoron/sync";
|
||||||
mods.sync.defaultSynced = false;
|
mods.sync.defaultSynced = false;
|
||||||
mods.sync.syncedAdditions = [ "42_desktop" "Downloads" ];
|
mods.sync.syncedAdditions = [ "42_desktop" "Downloads" ];
|
||||||
mods.sync.customHostName = "pc42";
|
mods.sync.customHostName = "pc42";
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
mods.nonChromium.enable = false;
|
|
||||||
}
|
|
@ -38,7 +38,6 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
stremio
|
stremio
|
||||||
blender
|
blender
|
||||||
wireshark
|
|
||||||
];
|
];
|
||||||
|
|
||||||
#mods.sync.syncedAdditions = ["VirtualBox VMs"];
|
#mods.sync.syncedAdditions = ["VirtualBox VMs"];
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
window.opacity = 0.95;
|
window.opacity = 0.9;
|
||||||
env.XTERM = "xterm-256color";
|
env.XTERM = "xterm-256color";
|
||||||
font.size = 9;
|
font.size = 9;
|
||||||
};
|
};
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
config = lib.mkIf config.mods.git.enable {
|
config = lib.mkIf config.mods.git.enable {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
|
||||||
userEmail = "tomoron@student.42angouleme.fr";
|
userEmail = "tomoron@student.42angouleme.fr";
|
||||||
userName = "tomoron";
|
userName = "tomoron";
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
@ -18,7 +17,6 @@
|
|||||||
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";
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
options.mods.nonChromium.enable = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "all chromium/electron based application can't be built by act-runner, so they can't be in the iso";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf config.mods.nonChromium.enable {
|
|
||||||
home.packages = with pkgs;[
|
|
||||||
discord
|
|
||||||
google-chrome
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
@ -18,7 +18,7 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
clang-tools
|
clang-tools
|
||||||
nixd
|
nixd
|
||||||
nodejs_24
|
nodejs_23
|
||||||
glsl_analyzer
|
glsl_analyzer
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -13,12 +13,11 @@
|
|||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
"$mainMod" = "SUPER";
|
"$mainMod" = "SUPER";
|
||||||
bind = [
|
bind = [
|
||||||
" , Print, exec, grim -t png -g \"$(slurp)\" /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
|
" , Print, exec, grim -t jpeg -g \"$(slurp)\" ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg"
|
||||||
"$mainMod, Return, exec, alacritty"
|
"$mainMod, Return, exec, alacritty"
|
||||||
"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"
|
||||||
|
@ -51,16 +51,6 @@
|
|||||||
#temperature.critical {
|
#temperature.critical {
|
||||||
color: #ff2222;
|
color: #ff2222;
|
||||||
}
|
}
|
||||||
|
|
||||||
#battery.critical {
|
|
||||||
color: #ff2222;
|
|
||||||
}
|
|
||||||
#cpu.high {
|
|
||||||
color: #ff2222;
|
|
||||||
}
|
|
||||||
#disk.high {
|
|
||||||
color: #ff2222;
|
|
||||||
}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
programs.waybar.settings.mainBar = {
|
programs.waybar.settings.mainBar = {
|
||||||
@ -71,7 +61,7 @@
|
|||||||
margin-right = 5;
|
margin-right = 5;
|
||||||
modules-left = ["hyprland/workspaces" "custom/music"];
|
modules-left = ["hyprland/workspaces" "custom/music"];
|
||||||
modules-center = ["hyprland/window"];
|
modules-center = ["hyprland/window"];
|
||||||
modules-right = ["disk" "pulseaudio" "network" "custom/pipe" "cpu" "custom/pipe" "temperature" "custom/pipe" "memory" "battery" "clock"];
|
modules-right = ["disk" "pulseaudio" "network" "custom/pipe" "cpu" "temperature" "custom/pipe" "memory" "battery" "clock"];
|
||||||
|
|
||||||
"hyprland/workspaces" = {
|
"hyprland/workspaces" = {
|
||||||
disable-scroll = true;
|
disable-scroll = true;
|
||||||
@ -86,9 +76,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
cpu = {
|
cpu = {
|
||||||
format = " {usage}% ";
|
format = " {usage}% |";
|
||||||
states.high = 80;
|
interval = 5;
|
||||||
interval = 5;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
memory = {
|
memory = {
|
||||||
@ -98,15 +87,13 @@
|
|||||||
|
|
||||||
battery = {
|
battery = {
|
||||||
bat = "BAT0";
|
bat = "BAT0";
|
||||||
full-at = 79;
|
|
||||||
states = {
|
states = {
|
||||||
good = 20;
|
good = 79;
|
||||||
|
warning = 30;
|
||||||
critical = 15;
|
critical = 15;
|
||||||
};
|
};
|
||||||
format-time = " {H}:{m}";
|
format-time = " {H}:{m}";
|
||||||
format-discharging = " {icon} {capacity}%{time} |";
|
format = " {icon} {capacity}%{time} |";
|
||||||
format-charging = " {capacity}%{time} |";
|
|
||||||
format-plugged = "";
|
|
||||||
format-icons = [" " " " " " " " " "];
|
format-icons = [" " " " " " " " " "];
|
||||||
interval = 10;
|
interval = 10;
|
||||||
};
|
};
|
||||||
@ -144,7 +131,6 @@
|
|||||||
|
|
||||||
disk = {
|
disk = {
|
||||||
format =" {percentage_used}% |";
|
format =" {percentage_used}% |";
|
||||||
states.high = "5";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"custom/pipe" = {
|
"custom/pipe" = {
|
||||||
|
@ -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/06/18 15:49:03 by tomoron ### ########.fr #
|
# Updated: 2025/02/12 09:36:07 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 is just a fallback now
|
''; # this is messy but i don't care, x11 isn't my default now.
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -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/07/15 16:10:34 by tomoron ### ########.fr #
|
# Updated: 2025/03/27 18:53:17 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -14,34 +14,24 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
home.packages = with pkgs;[
|
home.packages = with pkgs;[
|
||||||
lrzip
|
ripgrep
|
||||||
pigz
|
|
||||||
htop
|
activate-linux
|
||||||
gnumake
|
unison
|
||||||
git
|
discord
|
||||||
neofetch
|
google-chrome
|
||||||
neovim
|
brightnessctl
|
||||||
clang
|
playerctl
|
||||||
ninja
|
python3
|
||||||
gdb
|
vlc
|
||||||
valgrind
|
nerd-fonts.iosevka
|
||||||
wget
|
|
||||||
cmake
|
nix-index
|
||||||
man-pages
|
yubikey-manager
|
||||||
stress
|
yubico-pam
|
||||||
ffmpeg-full
|
dunst
|
||||||
ripgrep
|
bibata-cursors
|
||||||
activate-linux
|
libcaca
|
||||||
unison
|
nasm
|
||||||
brightnessctl
|
|
||||||
playerctl
|
|
||||||
python3
|
|
||||||
vlc
|
|
||||||
nix-index
|
|
||||||
dunst
|
|
||||||
yubikey-manager
|
|
||||||
bibata-cursors
|
|
||||||
libcaca
|
|
||||||
nasm
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1 +0,0 @@
|
|||||||
/nix/store/ffxpgsp8bpdfab8kd0vnlpappy5s65ag-home-manager-generation
|
|
Binary file not shown.
Before Width: | Height: | Size: 797 KiB |
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/02/09 01:43:46 by tomoron #+# #+# #
|
# Created: 2025/02/09 01:43:46 by tomoron #+# #+# #
|
||||||
# Updated: 2025/04/23 20:31:46 by tomoron ### ########.fr #
|
# Updated: 2025/04/03 13:24:06 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
users.users.tom = {
|
users.users.tom = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
|
extraGroups = [ "wheel" "docker" "libvirtd" "dialout"];
|
||||||
initialPassword = "password";
|
initialPassword = "password";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2,7 +2,12 @@
|
|||||||
{ config, lib, inputs, pkgs, ... }:
|
{ config, lib, inputs, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.kernelParams = [ "nvidia-drm-modset=1" ];
|
imports = [
|
||||||
|
../modules/game.nix
|
||||||
|
../modules/nvidia.nix
|
||||||
|
../modules/vboxHost.nix
|
||||||
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
cudatoolkit
|
cudatoolkit
|
||||||
lm_sensors
|
lm_sensors
|
||||||
@ -13,10 +18,9 @@
|
|||||||
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";
|
||||||
|
@ -13,13 +13,10 @@
|
|||||||
|
|
||||||
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
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
}
|
}
|
||||||
|
@ -1,46 +1,17 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
|
boot.kernelParams = [ "kvm.enable_virt_at_load=0" ];
|
||||||
boot.initrd.luks.devices.cryptroot.allowDiscards = true;
|
|
||||||
|
|
||||||
mods.displayManager.enable = true;
|
boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
|
||||||
mods.virtualManager.enable = false;
|
|
||||||
networking.firewall.enable = false;
|
services.displayManager.enable = true;
|
||||||
|
services.displayManager.ly.enable = true;
|
||||||
|
|
||||||
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;
|
||||||
@ -48,6 +19,7 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
acpi
|
acpi
|
||||||
tlp
|
tlp
|
||||||
|
looking-glass-client
|
||||||
fprintd
|
fprintd
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -80,9 +52,6 @@
|
|||||||
|
|
||||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||||
|
|
||||||
programs.wireshark.enable = true;
|
|
||||||
programs.wireshark.usbmon.enable = true;
|
|
||||||
|
|
||||||
# boot.plymouth = {
|
# boot.plymouth = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# theme = "ycontre-glow";
|
# theme = "ycontre-glow";
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
|
|
||||||
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" ];
|
||||||
@ -27,8 +26,6 @@
|
|||||||
libnvidia-container
|
libnvidia-container
|
||||||
screen
|
screen
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
boot.supportedFilesystems = [ "zfs" ];
|
boot.supportedFilesystems = [ "zfs" ];
|
||||||
|
|
||||||
# services.cron.enable = false;
|
# services.cron.enable = false;
|
||||||
@ -74,7 +71,6 @@
|
|||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
liveRestore = false;
|
liveRestore = false;
|
||||||
enableOnBoot = true;
|
enableOnBoot = true;
|
||||||
# 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"];
|
||||||
@ -88,7 +84,6 @@
|
|||||||
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";
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
{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,19 +1,14 @@
|
|||||||
{ config, lib, inputs, pkgs, ... }:
|
{ config, lib, inputs, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options.mods.virtualManager.enable = lib.mkOption {
|
options.mods.virtualbox.enable = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
description = "enable virtual manager as host";
|
description = "enable virtualbox as host";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.mods.virtualManager.enable {
|
config = lib.mkIf config.mods.virtualbox.enable {
|
||||||
programs.virt-manager.enable = true;
|
virtualisation.virtualbox.host.enable = true;
|
||||||
virtualisation.libvirtd.enable = true;
|
users.users.tom.extraGroups = [ "vboxusers" ];
|
||||||
virtualisation.libvirtd.qemu.runAsRoot = true;
|
|
||||||
virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
|
|
||||||
virtualisation.spiceUSBRedirection.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ spice-gtk ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,14 +2,28 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
home-manager
|
home-manager
|
||||||
vim
|
vim
|
||||||
pciutils
|
pciutils
|
||||||
usbutils
|
pigz
|
||||||
ntfs3g
|
htop
|
||||||
cryptsetup
|
gnumake
|
||||||
acpi
|
git
|
||||||
nerd-fonts.iosevka
|
neofetch
|
||||||
yubico-pam
|
neovim
|
||||||
|
ntfs3g
|
||||||
|
clang
|
||||||
|
ninja
|
||||||
|
gdb
|
||||||
|
valgrind
|
||||||
|
wget
|
||||||
|
cmake
|
||||||
|
usbutils
|
||||||
|
man-pages
|
||||||
|
stress
|
||||||
|
ffmpeg
|
||||||
|
cryptsetup
|
||||||
|
acpi
|
||||||
|
dconf
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user