Merge pull request #42 from JaKooLit/stable

Stable to main
JaKooLit · Jan 26, 2025 · 8b1ee41 · 8b1ee41
2 parents 873a180 + 21fa86d
commit 8b1ee41
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 87 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 ## Changelogs
 
-## 23 Jan 2025
-- set the timezone to take automatically based on IP location
+## 26 Jan 2025
+- system time will now be based via location or UTC
+- switched to full stable branch
 
 ## 12 Jan 2025
 - switch to final version of aylurs-gtk-shell-v1

diff --git a/README.md b/README.md
@@ -59,7 +59,9 @@ https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/50d53755-0f11-45d6-991
 
 
 > [!NOTE]
-> By default, all packages set to install are from NixOS unstable channel
+> By default, all packages set to install are from NixOS stable channel and hyprland is abit old version
+
+- one reason why I switched to stable branch is because NixOS unstable is really freaking unstable / buggy 
 
 
 #### 🪧🪧🪧 ANNOUNCEMENT 🪧🪧🪧

diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,8 @@
   description = "KooL's NixOS-Hyprland"; 
 
   inputs = {
-  	nixpkgs.url = "nixpkgs/nixos-unstable";
+	nixpkgs.url = "nixpkgs/nixos-24.11";
+  	#nixpkgs.url = "nixpkgs/nixos-unstable";
 	#hyprland.url = "github:hyprwm/Hyprland"; # hyprland development
 	distro-grub-themes.url = "github:AdisonCavani/distro-grub-themes";
 	ags.url = "github:aylur/ags/v1"; # aylurs-gtk-shell-v1

diff --git a/hosts/default/config.nix b/hosts/default/config.nix
@@ -35,8 +35,8 @@
  	  ];
 
     # This is for OBS Virtual Cam Support
-    kernelModules = [ "v4l2loopback" ];
-    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+    #kernelModules = [ "v4l2loopback" ];
+    #  extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
 
     initrd = { 
       availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
@@ -48,7 +48,7 @@
     #  "vm.max_map_count" = 2147483642;
     #};
 
-    ## BOOT LOADERS: NOT USE ONLY 1. either systemd or grub  
+    ## BOOT LOADERS: NOTE USE ONLY 1. either systemd or grub  
     # Bootloader SystemD
     loader.systemd-boot.enable = true;
 
@@ -99,7 +99,6 @@
   #  theme = "nixos";
   #};
 
-
   # Extra Module Options
   drivers.amdgpu.enable = true;
   drivers.intel.enable = true;
@@ -138,71 +137,6 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  nixpkgs.config.allowUnfree = true;
-
-  programs = {
-	  hyprland = {
-      enable = true;
-		  #package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; #hyprland-git
-		  portalPackage = pkgs.xdg-desktop-portal-hyprland;
-  	  xwayland.enable = true;
-      };
-
-
-	  waybar.enable = true;
-	  hyprlock.enable = true;
-	  firefox.enable = true;
-	  git.enable = true;
-    nm-applet.indicator = true;
-    #neovim.enable = true;
-
-	  thunar.enable = true;
-	  thunar.plugins = with pkgs.xfce; [
-		  exo
-		  mousepad
-		  thunar-archive-plugin
-		  thunar-volman
-		  tumbler
-  	  ];
-
-    virt-manager.enable = false;
-
-    #steam = {
-    #  enable = true;
-    #  gamescopeSession.enable = true;
-    #  remotePlay.openFirewall = true;
-    #  dedicatedServer.openFirewall = true;
-    #};
-
-    xwayland.enable = true;
-
-    dconf.enable = true;
-    seahorse.enable = true;
-    fuse.userAllowOther = true;
-    mtr.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-  };
-
-  users = {
-    mutableUsers = true;
-  };
-
-  # Extra Portal Configuration
-  xdg.portal = {
-    enable = true;
-    wlr.enable = false;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-    configPackages = [
-      pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal
-    ];
-  };
 
   # Services to start
   services = {
@@ -241,7 +175,7 @@
 	    wireplumber.enable = true;
   	  };
 
-    pulseaudio.enable = false; #unstable
+    #pulseaudio.enable = false; #unstable
 	  udev.enable = true;
 	  envfs.enable = true;
 	  dbus.enable = true;
@@ -339,9 +273,6 @@
     };
   };
 
-  # Enable sound with pipewire.
-  # hardware.pulseaudio.enable = false; # replaced with services.pulseaudio 04-Jan-2025
-
   # Security / Polkit
   security.rtkit.enable = true;
   security.polkit.enable = true;

diff --git a/hosts/default/packages-fonts.nix b/hosts/default/packages-fonts.nix
@@ -1,5 +1,5 @@
 # 💫 https://github.com/JaKooLit 💫 #
-# Packages and Fonts config
+# Packages and Fonts config including the "programs" options
 
 { pkgs, inputs, ...}: let
 
@@ -12,6 +12,9 @@
     );
 
   in {
+
+  nixpkgs.config.allowUnfree = true;
+
   environment.systemPackages = (with pkgs; [
   # System Packages
     baobab
@@ -49,16 +52,15 @@
     gnome-system-monitor
     grim
     gtk-engine-murrine #for gtk themes
-    hyprcursor # requires unstable channel
     hypridle # requires unstable channel
     imagemagick 
     inxi
     jq
     kitty
     libsForQt5.qtstyleplugin-kvantum #kvantum
     networkmanagerapplet
-    nwg-look # requires unstable channel
-    nvtopPackages.panthor
+    nwg-look
+    #nvtopPackages.intel	 
     pamixer
     pavucontrol
     playerctl
@@ -95,8 +97,69 @@
     jetbrains-mono
     font-awesome
 	  terminus_font
-    #(nerdfonts.override {fonts = ["JetBrainsMono"];}) # stable banch
-    nerd-fonts.jetbrains-mono # unstable
-    nerd-fonts.fira-code # unstable
+    (nerdfonts.override {fonts = ["JetBrainsMono"];}) # stable banch
+    #nerd-fonts.jetbrains-mono # unstable
+    #nerd-fonts.fira-code # unstable
  	];
+
+  programs = {
+	  hyprland = {
+      enable = true;
+		    #package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; #hyprland-git
+		    portalPackage = pkgs.xdg-desktop-portal-hyprland;
+  	  xwayland.enable = true;
+      };
+
+
+	  waybar.enable = true;
+	  hyprlock.enable = true;
+	  firefox.enable = true;
+	  git.enable = true;
+    nm-applet.indicator = true;
+    #neovim.enable = true;
+
+	  thunar.enable = true;
+	  thunar.plugins = with pkgs.xfce; [
+		  exo
+		  mousepad
+		  thunar-archive-plugin
+		  thunar-volman
+		  tumbler
+  	  ];
+
+    virt-manager.enable = false;
+
+    #steam = {
+    #  enable = true;
+    #  gamescopeSession.enable = true;
+    #  remotePlay.openFirewall = true;
+    #  dedicatedServer.openFirewall = true;
+    #};
+
+    xwayland.enable = true;
+
+    dconf.enable = true;
+    seahorse.enable = true;
+    fuse.userAllowOther = true;
+    mtr.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+
+  };
+
+  # Extra Portal Configuration
+  xdg.portal = {
+    enable = true;
+    wlr.enable = false;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+    ];
+    configPackages = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal
+    ];
+    };
+
   }
diff --git a/hosts/default/users.nix b/hosts/default/users.nix
@@ -8,6 +8,7 @@ let
 in
 {
   users = { 
+    mutableUsers = true;
     users."${username}" = {
       homeMode = "755";
       isNormalUser = true;

diff --git a/modules/amd-drivers.nix b/modules/amd-drivers.nix
@@ -18,7 +18,7 @@ in
     hardware.graphics = {
       extraPackages = with pkgs; [
         libva
-			  libva-utils	
+			  libva-utils
         ];
     };
   };

diff --git a/modules/intel-drivers.nix b/modules/intel-drivers.nix
@@ -21,7 +21,7 @@ in
         intel-media-driver
         libvdpau-va-gl
         libva
-			  libva-utils	
+			  libva-utils
       ];
     };
   };

diff --git a/modules/nvidia-drivers.nix b/modules/nvidia-drivers.nix
@@ -23,7 +23,7 @@ in
   	  nvidia-vaapi-driver
   	  vdpauinfo
 	    libva
- 		  libva-utils		
+ 		  libva-utils	
     	];
   	};