34 Commits

Author SHA1 Message Date
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
5f64559676 set rofi theme by default and add wireshark to laptop config
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 14m16s
2025-04-25 00:14:11 +02:00
a82be1df2c change wallpaper_test
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 10m30s
2025-04-22 22:49:38 +02:00
f5ea128df4 update flake and install git lfs
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 8m33s
2025-04-21 20:39:21 +02:00
3207899d6c try other wallpaper, might go back
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 13m4s
2025-04-20 21:45:05 +02:00
e2e9a60907 update flake
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 10m34s
2025-04-17 17:41:03 +02:00
26448d59d6 copy screenshot to clipboard automatically
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 11m39s
2025-04-16 16:28:49 +02:00
4d140208b3 change name for chromium apps on iso
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 12m14s
2025-04-16 15:02:19 +02:00
d965848b31 create iso only when there is a push to master
Some checks failed
Build iso when a new version is pushed / test (push) Has been cancelled
2025-04-16 14:57:32 +02:00
a6eaa69a1c second try of final build
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 11m50s
2025-04-16 02:25:19 +02:00
2eeff79ea0 fix workflow release name
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 7s
2025-04-16 02:22:56 +02:00
7044d1eebb create release with curl in workflow
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 6s
2025-04-16 02:16:54 +02:00
ca2a2a8e8d re-enable iso build and test final auto release
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 7m50s
2025-04-15 21:31:38 +02:00
a5762a6a45 change tag name auto release
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 8s
2025-04-15 21:30:00 +02:00
d5df83a046 use gitea-release-action
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 9s
2025-04-15 21:28:03 +02:00
1c38dc5686 fix workflow file
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 12s
2025-04-15 20:06:46 +02:00
b55c6baf47 fix workflow syntax
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 12s
2025-04-15 20:01:32 +02:00
7887f3c650 add tag to release step 2025-04-15 20:00:48 +02:00
de34ac63af create tag automatically on push
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 13s
2025-04-15 19:54:43 +02:00
64f4635618 add version on go setup
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 17s
2025-04-15 19:47:58 +02:00
fbdc5b8810 add go install on workflow, temp remove iso build for faster tests
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 16s
2025-04-15 19:46:47 +02:00
0baab5a237 small changes on waybar 2025-04-15 19:45:30 +02:00
23 changed files with 153 additions and 71 deletions

View File

@ -1,6 +1,9 @@
name: Build iso when a new version is pushed
run-name: iso building
on: [push]
on:
push:
branches:
- 'master'
jobs:
test:
@ -12,12 +15,46 @@ jobs:
- name: install nix
uses: https://github.com/cachix/install-nix-action@v31
- 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
uses: https://gitea.com/actions/release-action@main
with:
files: |-
nixos.iso
api_key: '${{secrets.RELEASE_TOKEN}}'
run: |
AUTH_TOKEN=${{secrets.RELEASE_TOKEN}}
TAG_NAME=${{steps.vars.outputs.TAG}}
owner=tom
repo=nix-config
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

24
flake.lock generated
View File

@ -8,11 +8,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1744173435,
"narHash": "sha256-q5cViHmB4k1CdncBUVBY4UUukiKQxgBJ6R18qJ3pHOA=",
"lastModified": 1750651402,
"narHash": "sha256-mT97WT4FlJyvfWp7rso3tUZca0qKU46czyi/HBJHG4w=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "e7ea586f82360a06ec21f14544bc26b10aa1aea6",
"rev": "13fa5e2e89062281dee88508f97e93360bfe2e2d",
"type": "gitlab"
},
"original": {
@ -29,11 +29,11 @@
]
},
"locked": {
"lastModified": 1744208565,
"narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
"lastModified": 1750690749,
"narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
"rev": "05b8c9506452349d8be854ac46e5a7630fa7917d",
"type": "github"
},
"original": {
@ -44,11 +44,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1743420942,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"lastModified": 1750431636,
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
"type": "github"
},
"original": {
@ -60,11 +60,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1744098102,
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"lastModified": 1750506804,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"type": "github"
},
"original": {

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/17 18:15:38 by tomoron #+# #+# #
# Updated: 2025/03/19 15:45:13 by tomoron ### ########.fr #
# Updated: 2025/05/12 12:35:00 by tomoron ### ########.fr #
# #
# **************************************************************************** #
@ -64,9 +64,11 @@
home.sessionPath = [ "~/.local/bin" ];
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/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";
".local/share/rofi/themes".source = "${builtins.fetchGit {
url = "https://github.com/newmanls/rofi-themes-collection";

View File

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

View File

@ -1,5 +1,5 @@
{ lib, pkgs, ... }:
{
mods.discord.enable = false;
mods.nonChromium.enable = false;
}

View File

@ -38,6 +38,7 @@
home.packages = with pkgs; [
stremio
blender
wireshark
];
#mods.sync.syncedAdditions = ["VirtualBox VMs"];

View File

@ -11,7 +11,7 @@
programs.alacritty = {
enable = true;
settings = {
window.opacity = 0.9;
window.opacity = 0.95;
env.XTERM = "xterm-256color";
font.size = 9;
};

View File

@ -1,16 +0,0 @@
{ config, lib, pkgs, ... }:
{
options.mods.discord.enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = "install discord";
};
config = lib.mkIf config.mods.discord.enable {
home.packages = with pkgs;[
discord
google-chrome
];
};
}

View File

@ -10,6 +10,7 @@
config = lib.mkIf config.mods.git.enable {
programs.git = {
enable = true;
lfs.enable = true;
userEmail = "tomoron@student.42angouleme.fr";
userName = "tomoron";
extraConfig = {
@ -17,6 +18,7 @@
pull.rebase = true;
push.autoSetupRemote = true;
rerere.enabled = true;
help.autocorrect = 1;
};
aliases = {
fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";

View File

@ -0,0 +1,16 @@
{ 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
];
};
}

View File

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

View File

@ -13,7 +13,7 @@
wayland.windowManager.hyprland.settings = {
"$mainMod" = "SUPER";
bind = [
" , Print, exec, grim -t jpeg -g \"$(slurp)\" ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg"
" , Print, exec, grim -t png -g \"$(slurp)\" /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
"$mainMod, Return, exec, alacritty"
"CTRL_ALT, Q, killactive,"
"SUPER_ALT, Q, exit,"

View File

@ -51,6 +51,16 @@
#temperature.critical {
color: #ff2222;
}
#battery.critical {
color: #ff2222;
}
#cpu.high {
color: #ff2222;
}
#disk.high {
color: #ff2222;
}
'';
programs.waybar.settings.mainBar = {
@ -61,7 +71,7 @@
margin-right = 5;
modules-left = ["hyprland/workspaces" "custom/music"];
modules-center = ["hyprland/window"];
modules-right = ["disk" "pulseaudio" "network" "custom/pipe" "cpu" "temperature" "custom/pipe" "memory" "battery" "clock"];
modules-right = ["disk" "pulseaudio" "network" "custom/pipe" "cpu" "custom/pipe" "temperature" "custom/pipe" "memory" "battery" "clock"];
"hyprland/workspaces" = {
disable-scroll = true;
@ -76,8 +86,9 @@
};
cpu = {
format = " {usage}% |";
interval = 5;
format = " {usage}% ";
states.high = 80;
interval = 5;
};
memory = {
@ -87,13 +98,15 @@
battery = {
bat = "BAT0";
full-at = 79;
states = {
good = 79;
warning = 30;
good = 20;
critical = 15;
};
format-time = " {H}:{m}";
format = " {icon} {capacity}%{time} |";
format-discharging = " {icon} {capacity}%{time} |";
format-charging = " {capacity}%{time} |";
format-plugged = "";
format-icons = [" " " " " " " " " "];
interval = 10;
};
@ -131,6 +144,7 @@
disk = {
format =" 󰋊 {percentage_used}% |";
states.high = "5";
};
"custom/pipe" = {

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# 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, ... }:
@ -34,7 +34,7 @@
setxkbmap fr us&
nitrogen --restore &
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
View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 797 KiB

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/02/09 01:43:46 by tomoron #+# #+# #
# Updated: 2025/04/03 13:24:06 by tomoron ### ########.fr #
# Updated: 2025/04/23 20:31:46 by tomoron ### ########.fr #
# #
# **************************************************************************** #
@ -46,7 +46,7 @@
users.users.tom = {
isNormalUser = true;
extraGroups = [ "wheel" "docker" "libvirtd" "dialout"];
extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
initialPassword = "password";
};

View File

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

View File

@ -1,12 +1,12 @@
{ 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.allowDiscards = true;
services.displayManager.enable = true;
services.displayManager.ly.enable = true;
mods.displayManager.enable = true;
mods.virtualmanager.enable = false;
networking.firewall.enable = false;
networking.hostName = "patate-douce";
networking.wireless.enable = true;
@ -19,7 +19,6 @@
environment.systemPackages = with pkgs; [
acpi
tlp
looking-glass-client
fprintd
];
@ -52,6 +51,9 @@
services.udev.packages = [ pkgs.yubikey-personalization ];
programs.wireshark.enable = true;
programs.wireshark.usbmon.enable = true;
# boot.plymouth = {
# enable = true;
# theme = "ycontre-glow";

View File

@ -12,6 +12,7 @@
networking.hostName = "server";
services.openssh.enable = true;
services.openssh.settings.PasswordAuthentication = false;
services.openssh.ports = [ 1880 ];
services.xserver.videoDrivers = [ "nvidia" ];
@ -73,7 +74,7 @@
virtualisation.docker = {
liveRestore = false;
enableOnBoot = true;
package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
# package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
# daemon.settings = {
# runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
# exec-opts = ["native.cgroupdriver=cgroupfs"];
@ -87,6 +88,7 @@
hardware.nvidia-container-toolkit.enable = true;
hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.beta;
open = true;
# 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,16 @@
{ config, lib, inputs, pkgs, ... }:
{
options.mods.virtualbox.enable = lib.mkOption {
options.mods.virtualManager.enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = "enable virtualbox as host";
description = "enable virtual manager as host";
};
config = lib.mkIf config.mods.virtualbox.enable {
virtualisation.virtualbox.host.enable = true;
users.users.tom.extraGroups = [ "vboxusers" ];
config = lib.mkIf config.mods.virtualManager.enable {
programs.virt-manager.enable = true;
virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.runAsRoot = true;
virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
};
}

View File

@ -2,6 +2,7 @@
{
environment.systemPackages = with pkgs; [
lrzip
home-manager
vim
pciutils
@ -21,9 +22,11 @@
usbutils
man-pages
stress
ffmpeg
cryptsetup
acpi
dconf
ffmpeg-full
nv-codec-headers
];
}