change home location

.gitea/workflows/default.yaml

@@ -1,9 +1,6 @@
 name: Build iso when a new version is pushed
 run-name: iso building
-on:
+on: [push]
-  push:
-    branches:
-      - 'master'
 
 jobs:
   test:
@@ -11,50 +8,13 @@ jobs:
     steps:
       - name: get repo
         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
-        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

Makefile

@@ -1,7 +1,7 @@
 HOST ?= $(file < /etc/nixosFlakeName)
 THREADS ?= $(shell nproc)
 FLAKE ?= .
-MODE = switch 
+MODE = boot
 
 FLAGS = --impure --cores $(THREADS) -j $(THREADS) 
 

flake.lock

@@ -2,17 +2,18 @@
   "nodes": {
     "firefox-addons": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1745752599,
+        "lastModified": 1743119709,
-        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
+        "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
+        "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
         "type": "gitlab"
       },
       "original": {
@@ -22,6 +23,21 @@
         "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": [
@@ -29,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745894335,
+        "lastModified": 1743345555,
-        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
+        "narHash": "sha256-Df8PxfWYF/z6RWcsKuXSks/FOCOCA7EiRdlWE2u0rRc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
+        "rev": "2760046f34780cc72f67e06240ccf6a7a3ae3765",
         "type": "github"
       },
       "original": {
@@ -44,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1745907084,
+        "lastModified": 1743167577,
-        "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=",
+        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f1e52a018166e1a324f832de913e12c0e55792d0",
+        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
         "type": "github"
       },
       "original": {
@@ -60,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745794561,
+        "lastModified": 1743095683,
-        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
+        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
+        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
         "type": "github"
       },
       "original": {
@@ -74,22 +90,6 @@
         "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,7 +116,6 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "pkgs-docker-2750": "pkgs-docker-2750",
         "plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
       }
     }

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    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";
       inputs.nixpkgs.follows = "nixpkgs";
 	};
-	pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
   };
 
   outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:
@@ -76,7 +75,7 @@
 
       homeConfigurations = {
 	    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"; };
 	    desktop = homeConfig { flakeName = "desktop"; };
 	    server = homeConfig { flakeName = "server"; };

homeConfigs/home.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/25 00:08:54 by tomoron          ###   ########.fr        #
+#    Updated: 2025/03/19 15:45:13 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -64,11 +64,9 @@
 
   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/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";

homeConfigs/hosts/ft.nix

@@ -12,7 +12,7 @@
   mods.x11.enable = true;
   programs.firefox.enable = false;
 
-  mods.sync.homeFolder = "/sgoinfre/goinfre/Perso/tomoron";
+  mods.sync.homeFolder = "/home/tomoron/sync";
   mods.sync.defaultSynced = false;
   mods.sync.syncedAdditions = [ "42_desktop" "Downloads" ];
   mods.sync.customHostName = "pc42";

homeConfigs/hosts/iso.nix

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

homeConfigs/hosts/laptop.nix

@@ -1,7 +1,6 @@
 { 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" = {
@@ -39,7 +38,6 @@
   home.packages = with pkgs; [
     stremio
     blender
-	wireshark
   ];
 
 #mods.sync.syncedAdditions = ["VirtualBox VMs"];

homeConfigs/modules/alacritty.nix

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

homeConfigs/modules/git.nix

@@ -10,7 +10,6 @@
   config = lib.mkIf config.mods.git.enable {
     programs.git = {
       enable = true;
-	  lfs.enable = true;
       userEmail = "tomoron@student.42angouleme.fr";
       userName = "tomoron";
       extraConfig = {
@@ -18,7 +17,6 @@
       	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";

homeConfigs/modules/nonChromium.nix

@@ -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
-	];
-  };
-}

homeConfigs/modules/wayland/hyprland.nix

@@ -13,7 +13,7 @@
     wayland.windowManager.hyprland.settings = {
       "$mainMod" = "SUPER";
       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"
         "CTRL_ALT, Q, killactive,"
         "SUPER_ALT, Q, exit,"

homeConfigs/modules/wayland/waybar.nix

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

homeConfigs/packages.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/15 15:58:07 by tomoron          ###   ########.fr        #
+#    Updated: 2025/03/27 18:53:17 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -18,6 +18,8 @@
 
 	activate-linux
 	unison
+	discord	
+	google-chrome
 	brightnessctl	
 	playerctl
 	python3

osConfigs/global.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    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 = {
      isNormalUser = true;
-     extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
+     extraGroups = [ "wheel" "docker" "libvirtd" "dialout"];
      initialPassword = "password";
    };
 

osConfigs/hosts/desktop.nix

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

osConfigs/hosts/iso.nix

@@ -17,9 +17,6 @@
 
   home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
   home-manager.users.tom = {
-    imports = [
+    imports = [ ../../homeConfigs/home.nix ];
-	  ../../homeConfigs/home.nix 
-	  ../../homeConfigs/hosts/iso.nix
-	];
   };
 }

osConfigs/hosts/laptop.nix

@@ -4,10 +4,9 @@
   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;
 
-  mods.displayManager.enable = true;
+  services.displayManager.enable = true;
-  networking.firewall.enable = false;
+  services.displayManager.ly.enable = true;
 
   networking.hostName = "patate-douce";
   networking.wireless.enable = true;
@@ -53,9 +52,6 @@
 
   services.udev.packages = [ pkgs.yubikey-personalization ];
 
-  programs.wireshark.enable = true;
-  programs.wireshark.usbmon.enable = true;
-
 #  boot.plymouth = {
 #    enable = true;
 #	theme = "ycontre-glow";

osConfigs/hosts/server.nix

@@ -26,8 +26,6 @@
 	libnvidia-container
 	screen
   ];
-
-
   boot.supportedFilesystems = [ "zfs" ];
 
 #  services.cron.enable = false;
@@ -73,7 +71,6 @@
   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"];

osConfigs/modules/displayManager.nix

@@ -1,15 +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;
-  };
-}
-

osConfigs/packages.nix

@@ -21,11 +21,9 @@
 	usbutils
 	man-pages
 	stress
+	ffmpeg
 	cryptsetup
 	acpi
 	dconf
-	
-	ffmpeg-full
-	nv-codec-headers
   ];
 }