Compare commits
25 Commits
new-42-hom
...
3207899
Author | SHA1 | Date | |
---|---|---|---|
3207899d6c | |||
e2e9a60907 | |||
26448d59d6 | |||
4d140208b3 | |||
d965848b31 | |||
a6eaa69a1c | |||
2eeff79ea0 | |||
7044d1eebb | |||
ca2a2a8e8d | |||
a5762a6a45 | |||
d5df83a046 | |||
1c38dc5686 | |||
b55c6baf47 | |||
7887f3c650 | |||
de34ac63af | |||
64f4635618 | |||
fbdc5b8810 | |||
0baab5a237 | |||
9defcf7ad4 | |||
e5c52b4bc5 | |||
72f6ae62bc | |||
1d1af1d929 | |||
a97f8c71a6 | |||
5db19e9bd4 | |||
f48ed2c39f |
@ -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:
|
||||
@ -8,13 +11,50 @@ jobs:
|
||||
steps:
|
||||
- name: get repo
|
||||
uses: actions/checkout@v4.2.2
|
||||
# - uses: https://github.com/cachix/install-nix-action@v31
|
||||
# - name: create iso image
|
||||
# run: make iso
|
||||
|
||||
- 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
|
||||
|
57
flake.lock
generated
57
flake.lock
generated
@ -2,18 +2,17 @@
|
||||
"nodes": {
|
||||
"firefox-addons": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1743119709,
|
||||
"narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
|
||||
"lastModified": 1744903587,
|
||||
"narHash": "sha256-Un9rJxwzlgALegN+6eXdPWtrP19dq/Ex6wlxaUJZLv4=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
|
||||
"rev": "6fba1be0f816617405d037be62ce39acb93693cc",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -23,21 +22,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -45,11 +29,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743345555,
|
||||
"narHash": "sha256-Df8PxfWYF/z6RWcsKuXSks/FOCOCA7EiRdlWE2u0rRc=",
|
||||
"lastModified": 1744902080,
|
||||
"narHash": "sha256-px7OEMQYhS9StY3sTYYeM/jJspk6SXgoPU7OmOSx+1c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2760046f34780cc72f67e06240ccf6a7a3ae3765",
|
||||
"rev": "2c71aae678c03a39c2542e136b87bd040ae1b3cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -60,11 +44,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1743167577,
|
||||
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
|
||||
"lastModified": 1744633460,
|
||||
"narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
|
||||
"rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -76,11 +60,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1743095683,
|
||||
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
|
||||
"lastModified": 1744463964,
|
||||
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
|
||||
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -90,6 +74,22 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -116,6 +116,7 @@
|
||||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"pkgs-docker-2750": "pkgs-docker-2750",
|
||||
"plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
|
||||
}
|
||||
}
|
||||
|
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2024/10/17 18:15:24 by tomoron #+# #+# #
|
||||
# Updated: 2025/03/19 15:48:10 by tomoron ### ########.fr #
|
||||
# Updated: 2025/04/13 13:35:56 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:
|
||||
|
5
homeConfigs/hosts/iso.nix
Normal file
5
homeConfigs/hosts/iso.nix
Normal file
@ -0,0 +1,5 @@
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
mods.nonChromium.enable = false;
|
||||
}
|
@ -1,6 +1,7 @@
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.file.".config/wallpaper.png".source = ../utils/wallpaper_test.png;
|
||||
programs.waybar.settings.mainBar = {
|
||||
modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"];
|
||||
"custom/dgpu" = {
|
||||
|
@ -11,7 +11,7 @@
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
window.opacity = 0.9;
|
||||
window.opacity = 0.95;
|
||||
env.XTERM = "xterm-256color";
|
||||
font.size = 9;
|
||||
};
|
||||
|
16
homeConfigs/modules/nonChromium.nix
Normal file
16
homeConfigs/modules/nonChromium.nix
Normal 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
|
||||
];
|
||||
};
|
||||
}
|
@ -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,"
|
||||
|
@ -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" = {
|
||||
|
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/02/09 22:01:56 by tomoron #+# #+# #
|
||||
# Updated: 2025/03/27 18:53:17 by tomoron ### ########.fr #
|
||||
# Updated: 2025/04/15 15:58:07 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -18,8 +18,6 @@
|
||||
|
||||
activate-linux
|
||||
unison
|
||||
discord
|
||||
google-chrome
|
||||
brightnessctl
|
||||
playerctl
|
||||
python3
|
||||
|
BIN
homeConfigs/utils/wallpaper_test.png
Normal file
BIN
homeConfigs/utils/wallpaper_test.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 41 KiB |
@ -17,6 +17,9 @@
|
||||
|
||||
home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
|
||||
home-manager.users.tom = {
|
||||
imports = [ ../../homeConfigs/home.nix ];
|
||||
imports = [
|
||||
../../homeConfigs/home.nix
|
||||
../../homeConfigs/hosts/iso.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
services.displayManager.enable = true;
|
||||
services.displayManager.ly.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
networking.hostName = "patate-douce";
|
||||
networking.wireless.enable = true;
|
||||
|
@ -26,6 +26,8 @@
|
||||
libnvidia-container
|
||||
screen
|
||||
];
|
||||
|
||||
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
|
||||
# services.cron.enable = false;
|
||||
@ -71,6 +73,7 @@
|
||||
virtualisation.docker = {
|
||||
liveRestore = false;
|
||||
enableOnBoot = true;
|
||||
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"];
|
||||
|
Reference in New Issue
Block a user