enable display manager on desktop

add git autocorrect
add allow discard to cryptroot
2025-05-06 22:47:47 +02:00 · 2025-05-01 21:38:53 +02:00 · 2025-04-29 15:56:22 +02:00 · 2025-04-27 16:36:28 +02:00 · 2025-04-26 17:09:25 +02:00 · 2025-04-25 00:14:11 +02:00
11 changed files with 44 additions and 25 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 HOST ?= $(file < /etc/nixosFlakeName)
 THREADS ?= $(shell nproc)
 FLAKE ?= .
-MODE = boot
+MODE = switch 

 FLAGS = --impure --cores $(THREADS) -j $(THREADS) 

--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1745222277,
-        "narHash": "sha256-zkUx4CzgqRS8bUT1hyEGol3w6/iv+tk0axMpdzTB7Mw=",
+        "lastModified": 1745752599,
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "da88304c0a5113485bd36a498ee05516cace8ec9",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
        "type": "gitlab"
      },
      "original": {
@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745256380,
-        "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
        "type": "github"
      },
      "original": {
@ -44,11 +44,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1744633460,
-        "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
+        "lastModified": 1745907084,
+        "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
+        "rev": "f1e52a018166e1a324f832de913e12c0e55792d0",
        "type": "github"
      },
      "original": {
@ -60,11 +60,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744932701,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "lastModified": 1745794561,
+        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
        "type": "github"
      },
      "original": {
--- a/homeConfigs/home.nix
+++ b/homeConfigs/home.nix
@ -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/04/25 00:08:54 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/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";
--- a/homeConfigs/hosts/laptop.nix
+++ b/homeConfigs/hosts/laptop.nix
@ -39,6 +39,7 @@
  home.packages = with pkgs; [
    stremio
    blender
+	wireshark
  ];

 #mods.sync.syncedAdditions = ["VirtualBox VMs"];
--- a/homeConfigs/modules/git.nix
+++ b/homeConfigs/modules/git.nix
@ -18,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";
--- a/homeConfigs/utils/wallpaper_test.png
+++ b/homeConfigs/utils/wallpaper_test.png
--- a/osConfigs/global.nix
+++ b/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/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";
   };

--- a/osConfigs/hosts/desktop.nix
+++ b/osConfigs/hosts/desktop.nix
@ -2,12 +2,6 @@
 { config, lib, inputs, pkgs, ... }:

 {
-  imports = [
-    ../modules/game.nix
-	../modules/nvidia.nix
-	../modules/vboxHost.nix
-  ];
-
  environment.systemPackages = with pkgs; [
  	cudatoolkit
  	lm_sensors
@ -18,6 +12,7 @@
  hardware.cpu.intel.updateMicrocode = true;

  boot.kernelModules = [ "kvm-intel" "nvidia" ];
+  mods.displayManager.enable = true;


  hardware.nvidia = {
--- a/osConfigs/hosts/laptop.nix
+++ b/osConfigs/hosts/laptop.nix
@ -4,9 +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;

-  services.displayManager.enable = true;
-  services.displayManager.ly.enable = true;
+  mods.displayManager.enable = true;
  networking.firewall.enable = false;

  networking.hostName = "patate-douce";
@ -53,6 +53,9 @@

  services.udev.packages = [ pkgs.yubikey-personalization ];

+  programs.wireshark.enable = true;
+  programs.wireshark.usbmon.enable = true;
+
 #  boot.plymouth = {
 #    enable = true;
 #	theme = "ycontre-glow";
--- a/osConfigs/modules/displayManager.nix
+++ b/osConfigs/modules/displayManager.nix
@ -0,0 +1,15 @@
+{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;
+  };
+}
+
--- a/osConfigs/packages.nix
+++ b/osConfigs/packages.nix
@ -21,9 +21,11 @@
 	usbutils
 	man-pages
 	stress
-	ffmpeg
 	cryptsetup
 	acpi
 	dconf
+	
+	ffmpeg-full
+	nv-codec-headers
  ];
 }
Author	SHA1	Message	Date
tomoron	633eea8877	enable display manager on desktop Some checks failed Build iso when a new version is pushed / test (push) Failing after 13m10s Details	2025-05-06 22:47:47 +02:00
tomoron	3b7c49041c	add git autocorrect All checks were successful Build iso when a new version is pushed / test (push) Successful in 12m49s Details	2025-05-01 21:38:53 +02:00
tomoron	e8fac6e226	add allow discard to cryptroot	2025-04-29 15:56:22 +02:00
tomoron	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 Details	2025-04-27 16:36:28 +02:00
tomoron	10c46e1e6a	update flake All checks were successful Build iso when a new version is pushed / test (push) Successful in 20m56s Details	2025-04-26 17:09:25 +02:00
tomoron	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 Details	2025-04-25 00:14:11 +02:00
tomoron	a82be1df2c	change wallpaper_test All checks were successful Build iso when a new version is pushed / test (push) Successful in 10m30s Details	2025-04-22 22:49:38 +02:00