From 212e75ea110653600f414533ef73e3ca952e9904 Mon Sep 17 00:00:00 2001
From: joy <mail@joygnu.org>
Date: Thu, 8 Aug 2024 15:26:04 +0200
Subject: [PATCH] freeeeeeeeeeeeeeeeeeeeeeee

---
 flake.lock                   |  6 +++---
 home/zsh/default.nix         |  9 +--------
 hosts/desktop/default.nix    | 13 +++++++++++--
 hosts/laptop/default.nix     | 13 +++----------
 modules/misc/default.nix     |  3 +--
 modules/packages/default.nix | 13 +++----------
 6 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8d0d1ff..1f81c1f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -142,11 +142,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1723016048,
-        "narHash": "sha256-boo9SgJkWwqC1hfDn1fLiZLBR4wB2uFcJURbj/KGKtE=",
+        "lastModified": 1723089792,
+        "narHash": "sha256-vXv+xno/CxWom/MFLz54QV4OYNZ8gJmqV82FtZeH51c=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "6af4b8e298a5c6a32468b433ff9931b83a999ce3",
+        "rev": "cba8af387c1e02cd459f5df427e190d2dbf7db85",
         "type": "gitlab"
       },
       "original": {
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 7a3d419..c6faaef 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -3,9 +3,9 @@
 {
   programs.zsh = {
     enable = true;
+    syntaxHighlighting.enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
     historySubstringSearch.enable = true;
     dotDir = ".config/zsh";
     initExtra = "PROMPT='%F{green}%~%f '";
@@ -37,12 +37,5 @@
     history.size = 1000000;
     history.path = ".config/zsh/history";
 
-    oh-my-zsh = {
-      enable = true;
-      plugins = [ 
-      "history-substring-search"
-      ];
-    };
-
   };
 }
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index b4eb46e..b99beb6 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -1,9 +1,18 @@
-{ inputs, ... }:
+{ inputs, lib, pkgs, ... }:
 {
-  services.hardware.openrgb.enable = true; 
   programs.steam.enable = true;
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+             "steam"
+           ];
+  environment.systemPackages = with pkgs; [
+    prismlauncher
+    mangohud
+    lutris
+  ];
+
   networking.hostName = "desktop";
   networking.networkmanager.enable = true;
+  services.hardware.openrgb.enable = true; 
   
   boot.loader = {
    timeout = 0;
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index cdd1bc2..395e290 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -2,16 +2,9 @@
 {
   networking.hostName = "laptop";
   networking.networkmanager.enable = true;
-  
-  boot.loader = {
-   timeout = 0;
-    efi.canTouchEfiVariables = false;
-    grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-      device = "nodev";
-    };
-  }; 
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   imports = [
     ../../modules
diff --git a/modules/misc/default.nix b/modules/misc/default.nix
index d58fea2..af325ce 100644
--- a/modules/misc/default.nix
+++ b/modules/misc/default.nix
@@ -17,10 +17,9 @@
   virtualisation.docker.rootless.enable = true;
   virtualisation.docker.enable = true;
   virtualisation.waydroid.enable = true;
-  nixpkgs.config.allowUnfree = true;
   programs.hyprland.enable = true;
-  users.defaultUserShell = pkgs.zsh;
   programs.zsh.enable = true; 
+  users.defaultUserShell = pkgs.zsh;
   nix.settings.experimental-features = [ "nix-command" "flakes"];
   programs.nix-ld.enable = true;
   time.timeZone = "Europe/Zurich";
diff --git a/modules/packages/default.nix b/modules/packages/default.nix
index 90163b2..10b7c21 100644
--- a/modules/packages/default.nix
+++ b/modules/packages/default.nix
@@ -1,12 +1,7 @@
 { pkgs, ... }:
 
 {
-
   environment.systemPackages = with pkgs; [
-  #Games
-  prismlauncher
-  mangohud
-  lutris
   #hackerman
   fastfetch
   cmatrix
@@ -41,6 +36,7 @@
   bottles
   boxbuddy
   waydroid
+  transmission_4-gtk  
   #gnome
   gnome.gnome-clocks
   gnome-calculator
@@ -52,18 +48,15 @@
   screen
   tree
   zip
-  rar
   unzip
-  unrar
   scrcpy
   appimage-run
   yt-dlp
   distrobox
   font-awesome
-  #laptop
-  alsa-utils
-  brightnessctl
   lm_sensors
+  #laptop
+  brightnessctl
   networkmanagerapplet
   ];  
 }