Merge branch 'master' of github.com:ARandomPig/nix-config

configuration.nix

@@ -30,7 +30,7 @@
 
   users.users.tom = {
      isNormalUser = true;
-     extraGroups = [ "wheel" "docker"];
+     extraGroups = [ "wheel" "docker" "libvirtd"];
      initialPassword = "password";
    };
 
@@ -51,6 +51,9 @@
 	ninja
 	gdb
 	valgrind
+	wget
+	cmake
+	usbutils
   ];
 
   #Open ports in the firewall.

flake.lock

@@ -9,11 +9,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1729915395,
+        "lastModified": 1731902594,
-        "narHash": "sha256-fD9q0wKTRyem5EYO7pt2FfgDUK/0bkR8Mitq2KaZxA0=",
+        "narHash": "sha256-uSkuDGR4nPtA2ObotrF2G2fmHDEHVG7bKVb0ZLr4Cew=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "f4a24161dbb580dc91bc59dc54b2d81308a71610",
+        "rev": "41a1d21207361f9369670da9d01c88fcdbfb25c3",
         "type": "gitlab"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729894599,
+        "lastModified": 1731887066,
-        "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=",
+        "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb",
+        "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1729742320,
+        "lastModified": 1731797098,
-        "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
+        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
+        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729665710,
+        "lastModified": 1731676054,
-        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -90,12 +90,47 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "plymouth-theme-ycontre-glow": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1731939263,
+        "narHash": "sha256-mLwLR5dEJTvtqJU/lvo9f8c3/xIFPOpXlPF3JsJtnHo=",
+        "ref": "refs/heads/master",
+        "rev": "702e7b014ef6cf748252e797724e4096bafcaafa",
+        "revCount": 1,
+        "type": "git",
+        "url": "file:///home/tom/Desktop/bordel/ycontre-glow"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/tom/Desktop/bordel/ycontre-glow"
+      }
+    },
     "root": {
       "inputs": {
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "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: 2024/10/31 20:22:15 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/18 15:13:57 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -25,9 +25,13 @@
 	  url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
 	  inputs.nixpkgs.follows = "nixpkgs";
 	};
+
+	plymouth-theme-ycontre-glow = {
+      url = "git+file:///home/tom/Desktop/bordel/ycontre-glow";
+	};
   };
 
-  outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, nixos-hardware, plymouth-theme-ycontre-glow, ... }@inputs:
 	let
 	  pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
       username="tom";

home.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2024/11/08 15:34:54 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/20 14:09:49 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -50,6 +50,9 @@
 	hyprlock
 	python3
 	vlc
+
+	grim
+	slurp
   ];
   
   home.file = {

homes/laptop/hyprland.nix

@@ -1,8 +1,11 @@
 { config, lib, pkgs, ... }:
 
 {
-  wayland.windowManager.hyprland.settings.monitor = [
+  wayland.windowManager.hyprland.settings = {
+    monitor= [
       "eDP-1, 1920x1080@120, 0x0, 1"
       "HDMI-A-1, 1920x1080@60, auto, auto"
     ];
+	env = [ "AQ_DRM_DEVICES,/dev/dri/card1"];
+  };
 }

hosts/laptop.nix

@@ -6,16 +6,26 @@
 	modules/nvidia.nix
 	modules/vboxHost.nix
   ];
+
+  boot.kernelParams = [ "amd_iommu=on" "iommu=pt" "kvm_amd.npt=1" "kvm_amd.avic=1"];
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+#  boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ];
+  boot.kernelModules = [ "vfio" "vfio-pci"];
+
+  systemd.tmpfiles.rules = [
+    "f /dev/shm/looking-glass 0660 tom libvirtd -"
+  ];
+  virtualisation.libvirtd.qemu.vhostUserPackages = with pkgs; [ virtiofsd ];
+
   networking.hostName = "patate-douce";
   networking.wireless.enable = true;
   networking.networkmanager.enable = false;
 
-  networking.firewall.allowedTCPPorts = [ 11470 12470 80 443 5000 ];
-  networking.firewall.allowedUDPPorts = [ 11470 12470 80 443 5000 ];
-
   environment.systemPackages = with pkgs; [
     acpi
 	tlp
+	looking-glass-client
+	fprintd
   ];
 
   hardware.nvidia.prime.offload = {
@@ -28,4 +38,12 @@
   services.libinput.touchpad.tapping = false;
 
   hardware.bluetooth.enable = true;
+
+  boot.plymouth = {
+    enable = true;
+	theme = "ycontre-glow";
+	themePackages = [
+		inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
+	];
+  };
 }

hosts/modules/game.nix

@@ -3,4 +3,8 @@
 {
   programs.steam.enable=true; 
   programs.steam.protontricks.enable=true;
+
+  environment.systemPackages = with pkgs; [ qemu quickemu];
+  programs.virt-manager.enable = true;
+  virtualisation.libvirtd.enable = true;
 }

modules/hyprland.nix

@@ -6,6 +6,7 @@
   wayland.windowManager.hyprland.settings = {
     "$mainMod" = "SUPER";
     bind = [
+	  " , 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,"
@@ -122,10 +123,12 @@
     decoration = {
       rounding = 10;
     
-      drop_shadow = true;
+      shadow = {
-      shadow_range = 4;
+	    enabled = true;
-      shadow_render_power = 3;
+		range = 4;
-      "col.shadow" = "rgba(1a1a1aee)";
+		render_power = 3;
+		color = "rgba(1a1a1aee)";
+	  };
     
       blur = {
         enabled = true;

modules/waybar.nix

@@ -60,7 +60,7 @@
     margin-right = 5;
     modules-left = ["hyprland/workspaces" "custom/music"];
     modules-center = ["hyprland/window"];
-    modules-right = ["custom/fans" "custom/dgpu" "disk" "pulseaudio" "network" "cpu" "temperature" "custom/pipe" "memory" "battery" "clock"];
+    modules-right = ["custom/fans" "custom/dgpu" "disk" "pulseaudio" "network" "custom/pipe" "cpu" "temperature" "custom/pipe" "memory" "battery" "clock"];
   
     "hyprland/workspaces" = {
       disable-scroll = true;
@@ -98,9 +98,9 @@
     };
 
     network = {
-      format-wifi = " {icon} {essid} |";
+      format-wifi = " {icon} {essid} ";
-      format-ethernet = "   {ifname}: {ipaddr}/{cidr} |";
+      format-ethernet = "   {ifname}: {ipaddr}/{cidr} ";
-      format-disconnected = " ⚠ Disconnected |";
+      format-disconnected = " ⚠ Disconnected ";
       format-icons =["󰤟 " "󰤢 " "󰤥 " "󰤨 "];
     };
 
@@ -131,6 +131,7 @@
     disk = {
       format =" 󰋊 {percentage_used}% |";
     };
+
     "custom/pipe" = {
       format = "|";
     };