From 093741c7b81823425e01b1c25f27e218f6508d0c Mon Sep 17 00:00:00 2001
From: shynd <shynd@r-io.lu>
Date: Tue, 25 Feb 2025 10:43:11 +0100
Subject: [PATCH] switch to nixos stable branch

---
 CHANGELOG.md                     |  1 +
 auto-install.sh                  |  4 ++--
 flake.nix                        |  9 +++++----
 hosts/default/config.nix         |  4 +++-
 hosts/default/packages-fonts.nix | 19 ++++++++++---------
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65e29c6..a47ae28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## changelog
 
 ## 23.02.25
+- switch to nixos stable branch
 - added fantasque-sans-mono font for kitty
 - added victor-mono font for hyprlock
 - replaced eog with loupe
diff --git a/auto-install.sh b/auto-install.sh
index d3e7804..719e199 100755
--- a/auto-install.sh
+++ b/auto-install.sh
@@ -104,8 +104,8 @@ read -p "${CAT} do you want to add ${MAGENTA}AGS or aylur's gtk shell v1${RESET}
 answer=${answer:-Y}
 
 if [[ "$answer" =~ ^[Nn]$ ]]; then
-  #sed -i 's|^\([[:space:]]*\)ags.url = "github:aylur/ags/v1";|\1#ags.url = "github:aylur/ags/v1";|' flake.nix
-  sed -i 's|^\([[:space:]]*\)ags_1|\1#ags_1|' hosts/default/packages-fonts.nix
+  sed -i 's|^\([[:space:]]*\)ags.url = "github:aylur/ags/v1";|\1#ags.url = "github:aylur/ags/v1";|' flake.nix
+  sed -i 's|^\([[:space:]]*\)ags|\1#ags|' hosts/default/packages-fonts.nix
 fi
 
 echo "-----"
diff --git a/flake.nix b/flake.nix
index dcf86c1..b89e703 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,12 @@
   description = "shynd's nixos-config"; 
   	
   inputs = {
-    #nixpkgs.url = "nixpkgs/nixos-24.11";
-    nixpkgs.url = "nixpkgs/nixos-unstable";
-    #hyprland.url = "github:hyprwm/Hyprland"; # hyprland development
+    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
+    ags.url = "github:aylur/ags/v1"; # aylurs-gtk-shell-v1
   };
 
   outputs = 
diff --git a/hosts/default/config.nix b/hosts/default/config.nix
index e36108a..0e7ffab 100644
--- a/hosts/default/config.nix
+++ b/hosts/default/config.nix
@@ -177,7 +177,7 @@
         wireplumber.enable = true;
       };
 
-      pulseaudio.enable = false; # unstable
+      # pulseaudio.enable = false; # unstable
       udev.enable = true;
       envfs.enable = true;
       dbus.enable = true;
@@ -254,6 +254,8 @@
     hardware.logitech.wireless.enable = false;
     hardware.logitech.wireless.enableGraphical = false;
 
+    hardware.pulseaudio.enable = false; # stable branch
+
     # bluetooth
     hardware = {
       bluetooth = {
diff --git a/hosts/default/packages-fonts.nix b/hosts/default/packages-fonts.nix
index cd24880..99a8aa1 100644
--- a/hosts/default/packages-fonts.nix
+++ b/hosts/default/packages-fonts.nix
@@ -42,7 +42,7 @@ in
 
     # hyprland stuff
     # (ags.overrideAttrs (oldAttrs: { inherit (oldAttrs) pname; version = "1.8.2"; }))
-    ags_1 # desktop overview
+    ags # desktop overview
     btop
     cliphist
     loupe
@@ -97,19 +97,20 @@ in
     font-awesome
     terminus_font
     victor-mono
-    # (nerdfonts.override {fonts = ["JetBrainsMono"];}) # stable branch
-    nerd-fonts.jetbrains-mono # unstable
-    nerd-fonts.fira-code # unstable
-    nerd-fonts.fantasque-sans-mono # unstable
+    (nerdfonts.override {fonts = ["JetBrainsMono"];}) # stable branch
+    (nerdfonts.override {fonts = ["FantasqueSansMono"];}) # stable branch
+
+    # nerd-fonts.jetbrains-mono # unstable
+    # nerd-fonts.fira-code # unstable
+    # nerd-fonts.fantasque-sans-mono # unstable
   ];
 
   programs = {
     hyprland = {
       enable = true;
-      #package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; #hyprland development or -git version
-      #portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; #xdph-development
-
-      portalPackage = pkgs.xdg-desktop-portal-hyprland;
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; #hyprland-git
+		  portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; #xdph-git
+     	#portalPackage = pkgs.xdg-desktop-portal-hyprland; # xdph none git
       xwayland.enable = true;
     };