update flake

Makefile

@@ -27,5 +27,5 @@ cleanup :
 	nix-env --delete-generations +1
 	sudo nix-collect-garbage -d
 
-optimise :
+optimize :
 	nix-store --optimize -vv

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1756741629,
+        "lastModified": 1768575137,
-        "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=",
+        "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382",
+        "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1756958609,
+        "lastModified": 1768622624,
-        "narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=",
+        "narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df",
+        "rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
         "type": "gitlab"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756954499,
+        "lastModified": 1768598210,
-        "narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1756925795,
+        "lastModified": 1768584846,
-        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
+        "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
+        "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756266583,
+        "lastModified": 1768305791,
-        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
+        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
+        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1756787288,
+        "lastModified": 1768564909,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754988908,
+        "lastModified": 1768481291,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:24 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 00:58:57 by tomoron          ###   ########.fr        #
+#    Updated: 2025/12/16 19:01:21 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -46,14 +46,19 @@
       osConfig = {flakeName, extraModules ? []}: nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; flakeName = flakeName; };
         modules = nixpkgs.lib.concatLists [
-		  [./osConfigs/os.nix ./osConfigs/hosts/${flakeName}.nix catppuccin.nixosModules.catppuccin]
+		  [
+		    ./osConfigs/os.nix
+			./osConfigs/hosts/${flakeName}.nix
+			catppuccin.nixosModules.catppuccin
+			inputs.sops-nix.nixosModules.sops
+		  ]
 		  extraModules
 		];
       };
 
-	  homeConfig = {flakeName, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration {
+	  homeConfig = {flakeName, sops ? true, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
-	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; };
+	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; configSops = sops; };
         modules = nixpkgs.lib.concatLists [
 		  [
 		    ./homeConfigs/home.nix
@@ -85,8 +90,8 @@
 
 
       homeConfigurations = {
-	    vbox = homeConfig { flakeName = "vbox"; };
+	    vbox = homeConfig { flakeName = "vbox";};
-	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";};
+	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron"; sops = false;};
 	    laptop = homeConfig { flakeName = "laptop"; };
 	    desktop = homeConfig { flakeName = "desktop"; };
 	    server = homeConfig { flakeName = "server"; };

homeConfigs/global/appearance.nix

@@ -0,0 +1,33 @@
+{ lib, pkgs, ... }:
+{
+  catppuccin = {
+  	enable = true;
+	flavor = "mocha";
+
+	dunst.enable = true;
+	dunst.flavor="frappe";
+
+    kvantum.apply = true;
+    rofi.enable = false;
+  };
+
+  gtk = {
+    enable = true;
+    theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
+    font = { name = "Sans"; size = 11; };
+  };
+
+  qt.style.name = "kvantum";
+
+  home.pointerCursor = {
+    gtk.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 16;
+  };
+
+  home.file = {
+    ".config/wallpaper.png".source = lib.mkDefault ../utils/wallpaper.png;
+    ".config/lock_screen.jpg".source = lib.mkDefault ../utils/lock_screen.jpg;
+  };
+}

homeConfigs/global/catppuccin.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  catppuccin = {
+  	enable = true;
+	flavor = "mocha";
+
+	dunst.enable = true;
+	dunst.flavor="frappe";
+
+    kvantum.apply = true;
+    rofi.enable = false;
+  };
+}

homeConfigs/global/fileManager.nix

@@ -0,0 +1,18 @@
+{ ... }: 
+{
+  programs.yazi = {
+    enable = true;
+	settings.mgr.sort_dir_first=false;
+  };
+
+  home.sessionVariables.BROWSER = "yazi";
+  programs.bash.bashrcExtra = ''
+    function y() {
+      local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
+      yazi "$@" --cwd-file="$tmp"
+      IFS= read -r -d "" cwd < "$tmp"
+      [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
+      rm -f -- "$tmp"
+    }
+  '';
+}

homeConfigs/global/rclone.nix

@@ -0,0 +1,21 @@
+{ config, homeDir, ... }:
+{
+  programs.rclone.enable = true;
+  sops.secrets."nextcloud_fuse/password" = {};
+  programs.rclone.remotes.nextcloud = {
+    config = {
+	  type = "webdav";
+	  url = "https://nc.tmoron.fr/remote.php/dav/files/tom";
+	  vendor = "nextcloud";
+	  user = "tom";
+    };
+	secrets.pass = config.sops.secrets."nextcloud_fuse/password".path;
+	mounts = {
+	  "/" = {
+	    enable = true;
+		mountPoint = "${homeDir}/nextcloud";
+		options.vfs-cache-mode = "writes";
+	  };
+	};
+  };
+}

homeConfigs/global/rofi.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  programs.rofi = {
+    enable = true;
+	theme = "rounded-nord-dark";
+  };
+
+  home.file.".local/share/rofi/themes".source = "${builtins.fetchGit {
+  	url = "https://github.com/newmanls/rofi-themes-collection";
+  	rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
+  	ref = "master";
+  }}/themes";
+}

homeConfigs/global/shell.nix

@@ -0,0 +1,20 @@
+{ ... }:
+{
+  home.shell.enableBashIntegration = true;
+  home.shellAliases = {
+    ls= "ls --color=auto";
+    grep = "grep --color=auto";
+    vim = "nvim";
+    vi = "nvim";
+    hl = "Hyprland";
+    clr = "clear";
+	noidle = "systemctl --user stop hypridle";
+  };
+  
+  programs.bash = {
+	enable = true;
+    historyControl = ["ignoreboth"];
+	historyIgnore = [ "ls" "cd" "exit" ];
+	shellOptions = [ "cdspell" "autocd"];
+  };
+}

homeConfigs/home.nix

@@ -6,16 +6,24 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/17 18:18:51 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/24 02:08:41 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-{lib, pkgs, config, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:
+{
+lib,
+username ? "tom",
+homeDir ? "/home/tom",
+isOs ? false,
+configSops ? true,
+... 
+}:
 
 {
   imports = lib.concatLists [
     [ ./packages.nix ]
     (lib.fileset.toList ./modules)
+    (lib.fileset.toList ./global)
   ];
 
   home.username = lib.mkIf (!isOs) "${username}";
@@ -23,94 +31,11 @@
 
   home.stateVersion = "24.05";
 
-  sops.defaultSopsFile = ../secrets/secrets.yaml;
+  sops = lib.mkIf configSops{
-  sops.age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
+    defaultSopsFile = ../secrets/secrets.yaml;
-  sops.secrets."nextcloud_fuse/password" = {};
+    age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
-
-  programs.rclone.enable = true;
-  programs.rclone.remotes.nextcloud = {
-    config = {
-	  type = "webdav";
-	  url = "https://nc.tmoron.fr/remote.php/dav/files/tom";
-	  vendor = "nextcloud";
-	  user = "tom";
-    };
-	secrets.pass = config.sops.secrets."nextcloud_fuse/password".path;
-	mounts = {
-	  "/" = {
-	    enable = true;
-		mountPoint = "${homeDir}/nextcloud";
-		options.vfs-cache-mode = "writes";
-	  };
-	};
   };
 
-#  programs.ghostty.enable = true;
-#  programs.ghostty.settings = {
-#    theme = "catppuccin-mocha";
-#	font-size = 9;
-#  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 16;
-  };
-
-  gtk = {
-    enable = true;
-    theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
-#    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
-    font = { name = "Sans"; size = 11; };
-  };
-
-  home.shellAliases = {
-    ls= "ls --color=auto";
-    grep = "grep --color=auto";
-    vim = "nvim";
-    vi = "nvim";
-    hl = "Hyprland";
-    clr = "clear";
-#    tagueule = "asusctl profile -P Quiet";
-#    parle = "asusctl profile -P performance";
-	noidle = "systemctl --user stop hypridle";
-  };
-  
-  programs.bash = {
-	enable = true;
-    historyControl = ["ignoreboth"];
-	historyIgnore = [ "ls" "cd" "exit" ];
-	shellOptions = [ "cdspell" "autocd"];
-  };
-
-  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_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";
-		rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
-		ref = "master";
-    }}/themes";
-
-  };
   services.dunst.enable = true;
-
   programs.home-manager.enable = true;
-
-  qt.style.name = "kvantum";
-  catppuccin.kvantum.apply = true;
-
-  catppuccin = {
-  	enable = true;
-	flavor = "mocha";
-
-	dunst.enable = true;
-	dunst.flavor="frappe";
-  };
 }

homeConfigs/hosts/desktop.nix

@@ -4,16 +4,18 @@
   mods.x11.enable = true;
   wayland.windowManager.hyprland.settings = {
     monitor = [
-	  "HDMI-A-1, 1920x1080@60, 0x0, auto"
+	  "DP-1, 1280x1024@75.03Hz, -3200x0, auto"
-      "HDMI-A-3, 1920x1080@60, 1920x0, auto"
+      "HDMI-A-1, 1920x1080@60Hz, -1920x0, auto"
-	  "DP-1, 1280x1024@60, 3840x0, auto"
+	  "HDMI-A-3, 1920x1080@60Hz, 0x0, auto"
-	  "DP-3, 1280x1024@60, 5120x0, auto"
+	  "DP-3, 1920x1080@60.00Hz, 1920x0, auto"
+	  "DP-4, 1280x1024@75.03Hz, 3840x0, auto"
     ];
 	workspace = [
-      "1, monitor:HDMI-A-1"
+      "4, monitor:DP-1"
-	  "2, monitor:HDMI-A-3, default:true"
+      "3, monitor:HDMI-A-1"
-	  "3, monitor:DP-1"
+	  "1, monitor:HDMI-A-3, default:true"
-	  "4, monitor:DP-3"
+	  "2, monitor:DP-3"
+	  "5, monitor:DP-4"
 	];
 	env = [
 		"AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0"

homeConfigs/hosts/laptop.nix

@@ -27,6 +27,11 @@
       ", XF86Launch1, exec, hyprlock"
       ", XF86Launch4, exec, pkill activate-linux"
 	];
+	bindl = [
+     ",switch:off:Lid Switch,exec,hyprctl keyword monitor \"eDP-1, 1920x1080@120, 0x0, 1\""
+     ",switch:on:Lid Switch,exec,hyprctl keyword monitor \"eDP-1, disable\""
+
+	];
     monitor= [
 #      "eDP-1, modeline 173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync, 0x0, 1"
 	  "eDP-1, 1920x1080@120, 0x0, 1"
@@ -41,77 +46,4 @@
 	localsend
   ];
 
-#  programs.superfile = {
-#    enable = true;
-#	hotkeys = {
-#	  # global
-#      confirm = ["enter" ""];
-#      quit = ["ctrl+c" ""];
-#      
-#      # movement
-#      list_up = ["k" ""];
-#      list_down = ["j" ""];
-#      page_up = ["pgup"""];
-#      page_down = ["pgdown"""];
-#      
-#      # file panel control
-#      create_new_file_panel = ["n" ""];
-#      close_file_panel = ["q" ""];
-#      next_file_panel = ["tab" ""];
-#      previous_file_panel = ["shift+tab" ""];
-#      toggle_file_preview_panel = ["f" ""];
-#      open_sort_options_menu = ["o" ""];
-#      toggle_reverse_sort = ["R" ""];
-#      
-#      # change focus
-#      focus_on_process_bar = ["ctrl+p" ""];
-#      focus_on_sidebar = ["ctrl+s" ""];
-#      focus_on_metadata = ["ctrl+d" ""];
-#      
-#      # create file/directory and rename
-#      file_panel_item_create = ["a" ""];
-#      file_panel_item_rename = ["r" ""];
-#      
-#      # file operations
-#      copy_items = ["y" ""];
-#      cut_items = ["x" ""];
-#      paste_items = ["p" ""];
-#      delete_items = ["d" ""];
-#      
-#      # compress and extract
-#      extract_file = ["ctrl+e" ""];
-#      compress_file = ["ctrl+a" ""];
-#      
-#      # editor
-#      open_file_with_editor = ["e" ""];
-#      open_current_directory_with_editor = ["E" ""];
-#      
-#      # other
-#      pinned_directory = ["P" ""];
-#      toggle_dot_file = ["." ""];
-#      change_panel_mode = ["m" ""];
-#      open_help_menu = ["?" ""];
-#      open_command_line = [":" ""];
-#      copy_path = ["Y" ""];
-#      copy_present_working_directory = ["c" ""];
-#      toggle_footer = ["ctrl+f" ""];
-#      
-#      # Typing hotkeys (can conflict with all hotkeys)
-#      confirm_typing = ["enter" ""];
-#      cancel_typing = ["esc" ""];
-#      
-#      # =================================================================================================
-#      # Normal mode hotkeys (can conflict with other modes cannot conflict with global hotkeys)
-#      parent_directory = ["-" ""];
-#      search_bar = ["/" ""];
-#      
-#      # =================================================================================================
-#      # Select mode hotkeys (can conflict with other modes cannot conflict with global hotkeys)
-#      file_panel_select_mode_items_select_down = ["J" ""];
-#      file_panel_select_mode_items_select_up = ["K" ""];
-#      file_panel_select_all_items = ["A" ""];
-#
-#	};
-#  };
-
 }

homeConfigs/modules/game.nix

@@ -13,6 +13,8 @@
 	  mangohud
 	  moonlight-qt
 	  prismlauncher
+
+	  r2modman
 	];
   };
 }

homeConfigs/modules/git.nix

@@ -11,18 +11,20 @@
     programs.git = {
       enable = true;
 	  lfs.enable = true;
-      userEmail = "tomoron@student.42angouleme.fr";
+      settings = {
-      userName = "tomoron";
+        user.email = "tomoron@student.42angouleme.fr";
-      extraConfig = {
+        user.name = "tomoron";
       	init.defaultBranch="master";
       	pull.rebase = true;
       	push.autoSetupRemote = true;
 		rerere.enabled = true;
 		help.autocorrect = 1;
-      };
+		user.signingkey = "251B4BD73683A8DF13D760A868BFAFE31DF313AD";
-      aliases = {
+		commit.gpgsign = true;
-        fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
+        aliase = {
-        back = "reset HEAD~";
+          fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
+          back = "reset HEAD~";
+        };
       };
     };
   };

homeConfigs/modules/sync.nix

@@ -46,7 +46,7 @@ in
     text = (lib.strings.concatStrings [''
 		auto=true
 		root=${config.mods.sync.homeFolder}
-		root=ssh://tom@tmoron.fr:1880/${config.mods.sync.destFolder}
+		root=ssh://tom@free.tmoron.fr:1880/${config.mods.sync.destFolder}
 	  ''
 	  (lib.strings.concatMapStrings (x: "\npath=" + x) (( if config.mods.sync.defaultSynced then defPathLst else [] ) ++ config.mods.sync.syncedAdditions ))
       (if !(isNull config.mods.sync.customHostName) then "\nclientHostName=${config.mods.sync.customHostName}" else "")

homeConfigs/modules/vim.nix

@@ -29,7 +29,8 @@
       autocmd BufWinEnter *.* silent! loadview
       set tabstop=4
       set scrolloff=10
-      set preserveindent
+      set smartindent 
+	  set shiftwidth=4
       map <silent> <C-N> :bnext<CR>
       map <silent> <C-P> :bprevious<CR>
       nmap <silent> <c-k> :wincmd k<CR>
@@ -68,8 +69,8 @@
       lua require'lspconfig'.clangd.setup{}
       lua require'lspconfig'.nixd.setup{}
       lua require'lspconfig'.glsl_analyzer.setup{}
-      set signcolumn=no
+      set signcolumn=auto
-      
+
       nnoremap <leader>ff <cmd>Telescope find_files<cr>
       nnoremap <leader>fg <cmd>Telescope live_grep<cr>
       nnoremap <leader>fb <cmd>Telescope buffers<cr>

homeConfigs/modules/wayland/hyprland.nix

@@ -10,11 +10,14 @@
   config = lib.mkIf config.mods.hyprland.enable {
     wayland.windowManager.hyprland.systemd.variables = [ "--all" ];
 
+	programs.hyprshot.enable = true;
+
     wayland.windowManager.hyprland.enable = true;
     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, hyprshot -m region -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png"
+  	    " SHIFT, Print, exec, hyprshot -m output -m active -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png" 
         "$mainMod, Return, exec, alacritty"
         "CTRL_ALT, Q, killactive,"
         "CTRL_ALT_SHIFT, Q, forcekillactive,"
@@ -22,6 +25,7 @@
         "$mainMod, S, togglefloating,"
         "$mainMod, I, pin,"
         "$mainMod, D, exec, rofi -show drun -show-icons"
+        "$mainMod SHIFT, D, exec, rofi -show run -show-icons"
         "$mainMod, M, fullscreen, 1"
         "$mainMod, F, fullscreen, 0"
   
@@ -163,6 +167,12 @@
         allow_tearing = false;
         layout = "dwindle";
       };
+
+	  layerrule = {
+		name = "no_anim_for_selection";
+        no_anim = "on";
+        "match:namespace" = "selection";
+	  };
   
   	  cursor.no_warps = true;
   

homeConfigs/modules/wayland/packages.nix

@@ -3,7 +3,6 @@
 {
   config = lib.mkIf config.mods.hyprland.enable {
     home.packages = with pkgs; [
-      rofi-wayland
 	  grim
 	  slurp
 	  wl-clipboard

homeConfigs/packages.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/05 19:28:45 by tomoron          ###   ########.fr        #
+#    Updated: 2025/11/17 11:55:17 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -45,5 +45,7 @@
 	compiledb
 	yubikey-personalization
 	sops
+	libreoffice
+	doxygen
   ];
 }

osConfigs/global/sops.nix

@@ -0,0 +1,8 @@
+{lib, ...}:
+
+{
+  sops = {
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    age.keyFile = "/home/tom/.config/sops/age/keys.txt";
+  };
+}

osConfigs/hosts/desktop.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:57:04 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 00:57:05 by tomoron          ###   ########.fr        #
+#    Updated: 2025/12/23 18:41:48 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -22,20 +22,26 @@
   networking.hostName = "nixos-fixe";
 
   hardware.cpu.intel.updateMicrocode = true;
+  mods.yubikey.pam.enable = true;
 
   boot.kernelModules = [ "kvm-intel" "nvidia" ];
   mods.displayManager.enable = true;
 
-  hardware.nvidia = {
+  mods.nvidia.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
+  mods.gayming.enable = true;
-    open = true;
 
-    prime.nvidiaBusId = "PCI:1:0:0";
+  programs.noisetorch.enable = true;
-    prime.intelBusId = "PCI:0:2:0";
-    prime.sync.enable = true;
 
-    modesetting.enable = true;
+#  hardware.nvidia = {
-  };
+#    open = true;
+#
+#    prime.nvidiaBusId = "PCI:1:0:0";
+#    prime.intelBusId = "PCI:0:2:0";
+#    prime.sync.enable = true;
+#
+#    modesetting.enable = true;
+#  };
 
   services.openssh.enable = true;
+  programs.droidcam.enable = true;
 }

osConfigs/hosts/laptop.nix

@@ -6,11 +6,11 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:56:57 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/17 18:46:28 by tomoron          ###   ########.fr        #
+#    Updated: 2025/11/21 10:40:19 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   boot.initrd.luks.yubikeySupport = true;
@@ -32,6 +32,7 @@
   };
 
   boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
+  programs.droidcam.enable = true;
 
   mods.displayManager.enable = true;
   mods.virtualHost.enable = true;
@@ -70,6 +71,8 @@
   systemd.network.enable = true;
   networking.useNetworkd = true;
 
+  programs.noisetorch.enable = true;
+
   hardware.bluetooth.enable = true;
 
   environment.systemPackages = with pkgs; [
@@ -79,16 +82,23 @@
 
   mods.touchpad.enable = true;
 
-  mods.powerSave.enable = true;
+#  programs.gamescope.capSysNice = true;
-  mods.powerSave.powahCommandAdditions = [
+
-    "supergfxctl -m Hybrid"
+  mods.powerSave = {
-    "if asusctl profile -p | grep Balanced ; then asusctl profile -P Performance; fi"
+    enable = true;
-    "if asusctl profile -p | grep Quiet ; then asusctl profile -P Balanced; fi"
+    powahCommandAdditions = [
-  ];
+      "supergfxctl -m Hybrid"
-  mods.powerSave.tagueuleCommandAdditions = [
+      "if asusctl profile -p | grep Balanced ; then asusctl profile -P Performance; fi"
-    "echo \"can't safely turn off the GPU\""
+      "if asusctl profile -p | grep Quiet ; then asusctl profile -P Balanced; fi"
-	"asusctl profile -P Quiet"
+    ];
-  ];
+    tagueuleCommandAdditions = [
+      "echo \"can't safely turn off the GPU\""
+      "asusctl profile -P Quiet"
+    ];
+	cpuMaxFreq = 4465261;
+
+  };
+
 
   services.asusd = {
     enable = true;
@@ -97,7 +107,7 @@
 
   services.supergfxd.enable = true;
   services.supergfxd.settings = {
-    mode = "Integrated";
+    mode = lib.mkDefault "Integrated";
     vfio_enable = true;
     vfio_save = true;
     always_reboot = false;
@@ -115,7 +125,7 @@
   mods.nvidia.prime = true;
 
 
-#  services.usbmuxd.enable = true; #hangs when shutting down
+  services.usbmuxd.enable = true; #hangs when shutting down
 
 #  boot.plymouth = {
 #    enable = true;
@@ -126,4 +136,15 @@
 #  };
 
   services.flatpak.enable = true;
+
+
+  services.dnsmasq.enable = true;
+  services.dnsmasq.settings = {
+	  "dhcp-range" = ["192.168.1.150,192.168.1.250"];
+	  "dhcp-option" = [
+	    "3,192.168.1.254"
+	    "6,1.1.1.1,8.8.8.8,8.8.4.4"
+	  ];
+	  "interface" = "enp4s0f4u1";
+	};
 }

osConfigs/hosts/server.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:57:09 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 01:26:26 by tomoron          ###   ########.fr        #
+#    Updated: 2025/12/16 20:00:04 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -31,13 +31,32 @@ in
     config.boot.kernelPackages.gasket #driver for google coral edge tpu
   ];
 
+
   services.openssh.enable = true;
   services.openssh.settings.PasswordAuthentication = false;
   services.openssh.ports = [ 1880 ];
 
+  sops.secrets."cloudflared/token" = {};
+  systemd.services.cloudflared = {
+	after = [
+      "network.target"
+      "network-online.target"
+    ];
+	wants = [
+      "network.target"
+      "network-online.target"
+    ];
+	wantedBy = [ "multi-user.target" ];
+	serviceConfig = {
+	  ExecStart = ''${pkgs.bash}/bin/bash -c '${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate run --token "$(cat ${config.sops.secrets."cloudflared/token".path})"' '';
+	  Restart = "on-failure";
+	};
+  };
+
   boot.extraModprobeConfig = ''
     options amdgpu virtual_display=1
-  ''; #create dummy display to be able to start x11
+# create dummy display to be able to start x11
+  ''; 
 
   boot.supportedFilesystems = [ "zfs" ];
 
@@ -68,6 +87,10 @@ in
   services.fail2ban.enable = true;
   services.fail2ban.bantime = "5h";
 
+  mods.nvidia.enable = true;
+  mods.nvidia.beta = true;
+  mods.nvidia.containerToolkit = true;
+
   mods.docker = {
     enable = true;
     boot = true;

osConfigs/modules/displayManager.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/05 23:47:16 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 00:56:38 by tomoron          ###   ########.fr        #
+#    Updated: 2025/11/17 14:32:13 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -24,7 +24,7 @@
       services.displayManager.ly.enable = true;
     services.displayManager.ly.settings = 
     {
-      animation = "doom";
+      animation = "gameoflife";
       min_refresh_delta = 50;
       bigclock = "en";
       sleep_cmd = "systemctl sleep";

osConfigs/modules/game.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/05 23:47:09 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/05 23:54:57 by tomoron          ###   ########.fr        #
+#    Updated: 2025/10/27 00:50:29 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -22,5 +22,6 @@
   config = lib.mkIf config.mods.gayming.enable {
     programs.steam.enable = true; 
     programs.steam.protontricks.enable = true;
+    programs.gamescope.enable = true;
   };
 }

osConfigs/modules/nvidia.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/05 23:47:19 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 01:12:34 by tomoron          ###   ########.fr        #
+#    Updated: 2025/12/23 18:42:01 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -28,7 +28,7 @@
     open = lib.mkOption {
       type = lib.types.bool;
       default = true;
-      description = "use beta version of the drivers";
+      description = "use open version of the drivers (on newer gpu)";
     };
     containerToolkit = lib.mkOption {
       type = lib.types.bool;
@@ -38,7 +38,7 @@
     prime = lib.mkOption {
       type = lib.types.bool;
       default = false;
-      description = "enable nvidia prime offload (saves battery)";
+      description = "enable nvidia prime offload (saves battery). prime ?";
     };
   };
   

osConfigs/modules/powerSave.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:45:04 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/17 18:47:27 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/23 04:25:20 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -19,6 +19,7 @@
       default = false;
       description = "enable services and settings to save power";
     };
+
     powahCommandAdditions = lib.mkOption {
       type = lib.types.listOf lib.types.str;
       default = [];
@@ -29,6 +30,41 @@
       default = [];
       description = "commands the `tagueule` script runs";
     };
+
+    pStateCompatible = lib.mkOption {
+	  type = lib.types.bool;
+	  default = false;
+	  description = "is the cpu p-state compatible. only most of intel cpu's";
+	};
+
+    cpuMaxFreq = lib.mkOption {
+	  type = lib.types.ints.positive;
+	  default = 5000000;
+	  description = "the max frequency of the cpu (in KHz)";
+	};
+
+	governorPowers = {
+      ac.min = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 30;
+	    description = "min frequency on AC";
+	  };
+      ac.max = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 100;
+	    description = "max frequency on AC";
+	  };
+      bat.min = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 0;
+	    description = "min frequency on BAT";
+	  };
+      bat.max = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 40;
+	    description = "max frequency on BAT";
+	  };
+	};
   };
 
 
@@ -44,12 +80,19 @@
     
         CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
         CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-    
+      }
-        CPU_MIN_PERF_ON_AC = 0;
+	  // lib.optionalAttrs (!config.mods.powerSave.pStateCompatible) (with config.mods.powerSave; {
-        CPU_MAX_PERF_ON_AC = 100;
+        CPU_SCALING_MIN_FREQ_ON_AC  = (cpuMaxFreq * governorPowers.ac.min) / 100;
-        CPU_MIN_PERF_ON_BAT = 0;
+        CPU_SCALING_MAX_FREQ_ON_AC  = (cpuMaxFreq * governorPowers.ac.max) / 100;
-        CPU_MAX_PERF_ON_BAT = 20;
+        CPU_SCALING_MIN_FREQ_ON_BAT = (cpuMaxFreq * governorPowers.bat.min) / 100;
-      };
+        CPU_SCALING_MAX_FREQ_ON_BAT = (cpuMaxFreq * governorPowers.bat.max) / 100;
+      }) 
+	  // lib.optionalAttrs config.mods.powerSave.pStateCompatible (with config.mods.powerSave.governorPowers; {
+	    CPU_MIN_PERF_ON_AC = ac.min;
+        CPU_MAX_PERF_ON_AC = ac.max;
+        CPU_MIN_PERF_ON_BAT = bat.min;
+        CPU_MAX_PERF_ON_BAT = bat.max;
+	  });
     };
 
 	environment.systemPackages = [
@@ -57,11 +100,10 @@
 	    name = "powah";
 	    runtimeInputs = with pkgs; [ tlp ];
 	    text = ''
-	    if [[ $EUID -ne 0 ]]; then
+	      if [[ $EUID -ne 0 ]]; then
-           echo "This script must be run as root" 
+            exec sudo bash "$0" "$@"
-           exit 1
+          fi
-        fi
+		  tlp ac
-		tlp ac
         '' + lib.concatStringsSep "\n" config.mods.powerSave.powahCommandAdditions;
         })
 
@@ -69,17 +111,15 @@
 	    name = "tagueule";
 	    runtimeInputs = with pkgs; [ tlp ];
 	    text = ''
-	    if [[ $EUID -ne 0 ]]; then
+	      if [[ $EUID -ne 0 ]]; then
-           echo "This script must be run as root" 
+            exec sudo bash "$0" "$@"
-           exit 1
+          fi
-        fi
+		  tlp bat
-		tlp bat
         '' + lib.concatStringsSep "\n" config.mods.powerSave.tagueuleCommandAdditions;
         })
     ];
 
     powerManagement.enable = true;
-    services.upower.enable = true;
     mods.nvidia.prime = true;
   };
 }

secrets/secrets.yaml

@@ -1,6 +1,8 @@
 #ENC[AES256_GCM,data:1NcFm2XqZzmSSlr8wH4aXHDBhf+lOaZ/gUeK2T/U/hIBbqtfKtw=,iv:yS5iogRp6e3We/7wZnGy0XJzqLVfRVKlDhUs+tamcJ0=,tag:+z/qqF9n6/hQfv9aWXkCDQ==,type:comment]
 nextcloud_fuse:
     password: ENC[AES256_GCM,data:Rlyc9wO3rXJ97AAMzM+vJclEJ+eaSPtHkitqRL0=,iv:yuS2Tyo2HZGVb9tbWmmgOEwkyzLhlvq8iZ2YjGD0u9E=,tag:pf8n4pTvseh1pd12w8w4tw==,type:str]
+cloudflared:
+    token: ENC[AES256_GCM,data:LS1VIwbbVsJxZ90p+kK4xJhzrBRJ51XL2j8mGLDVj5JjYJKXKBDIXtlb0x8A9WDIVyBuLBkE9pfSfQXtvfvZdUeyXswVJFUNW0mX3yC/WaeNQdPYy7UgyGjorqk31aNJ6b9XqtdfV0++qPvXQDvwn44UY0juuiIJ5KcLZEskRcqVTilG5WYi/nInhGbSqtzniRNvrbsynIq0CVQDhi3haCHNpCJMQUIyXM/g6Xsc9b++GYlHjgrtHQ==,iv:DbvJfbMblgr6+dYBJqDSzECKK90Nkq8Eci5dC8fMIXQ=,tag:bjAs8p5dAkh2Adon0JDNqg==,type:str]
 sops:
     age:
         - recipient: age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
@@ -12,7 +14,7 @@ sops:
             clZaazZQdW5wYUhUNmM0QW91K0NLOTAKB6z7cKg54QmJo0U03u6RQkSCfJOAdeJa
             DiyPYjm02BNe8YPFbBFRpyT7G++j3h0yG+/Nr2zcQFyMMEpMv5QJvg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-09-05T17:58:05Z"
+    lastmodified: "2025-12-16T16:16:27Z"
-    mac: ENC[AES256_GCM,data:96G7VqaG8A46tQ1L7I2asiYtNZF7K3Wf+SzbwPrNV8zQio2jInawtD4WSzHmLs4Nv7M1TBHug/ho8mfYq6auXgpathiSzvj0Tzs/IEKXiTYa86tM3szwAepavMYWOl6OYJ7S39ku6BOMo3qC2BK/gpT5iy4c84ashn2wFd1n41A=,iv:6TShIsqnhCf/3uoAaz/R+Cwr2HrorROOXodXluTKM8M=,tag:BA9rQ73scKgetW3orV0HdQ==,type:str]
+    mac: ENC[AES256_GCM,data:2Ju1exddd4qcru1UjXKXUBjugUWT9D2HJjKV03JwMCL4Wssb/H6DNNRJcmD0oXqA9DnEp5NpElhwa93LcogcNVsXL+sKGzQpP5m+/vDVfl2NcwdLyBVIvTQ0dASee/JMwBLcgcYBZuvL00Twv07/ImdvYROIs/fQUSualc6Sgcw=,iv:XsJ1MYLwLuFPLYGJoa/RsfAqs88AQwuH+3ItWc681LU=,tag:8pNSPKnv0yLoNrmxb9l2Xg==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.11.0