feat: add some new flake inputs for other nixpkgs

lix: remove lix module
ghc: fix nixvim installGhc trace
libreoffice: switch to binary distribution

5 files changed, 45 insertions, 30 deletions

diff --git a/flake.nix b/flake.nix
index fdd4528..dcc6fce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,9 @@
 
   inputs = {
     # Nixpkgs
+    nixpkgs-master.url = "github:nixos/nixpkgs/master";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,10 +15,13 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    /*
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
+      url =
+        "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    */
     stylix = {url = "github:danth/stylix";};
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
@@ -30,7 +35,6 @@
     home-manager,
     stylix,
     spicetify-nix,
-    lix-module,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -42,7 +46,10 @@
     nixosConfigurations = {
       "${myHostName}" = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
-        modules = [./nixos/configuration.nix lix-module.nixosModules.default];
+        modules = [
+          ./nixos/configuration.nix
+          #lix-module.nixosModules.default
+        ];
       };
     };
 
@@ -56,8 +63,8 @@
         modules = [
           ./home-manager/${stevenUserName}/home.nix
           inputs.nixvim.homeManagerModules.nixvim
-          inputs.stylix.homeManagerModules.stylix
-          inputs.spicetify-nix.homeManagerModules.default
+          stylix.homeManagerModules.stylix
+          spicetify-nix.homeManagerModules.default
         ];
       };
     };
diff --git a/home-manager/stvnliu/hypr/hyprlock.nix b/home-manager/stvnliu/hypr/hyprlock.nix
index e93263b..99529f3 100644
--- a/home-manager/stvnliu/hypr/hyprlock.nix
+++ b/home-manager/stvnliu/hypr/hyprlock.nix
@@ -14,29 +14,29 @@
         no_fade_in = false;
       };
 
-      background = [
-        {
-          path = "screenshot";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
+      #background = [
+      #  {
+      #    path = "screenshot";
+      #    blur_passes = 3;
+      #    blur_size = 8;
+      #  }
+      #];
 
-      input-field = [
-        {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          #placeholder_text = '\'<span foreground="##cad3f5">Password...</span>'\';
-          shadow_passes = 2;
-        }
-      ];
+      #input-field = [
+      #  {
+      #    size = "200, 50";
+      #    position = "0, -80";
+      #    monitor = "";
+      #    dots_center = true;
+      #    fade_on_empty = false;
+      #    font_color = "rgb(202, 211, 245)";
+      #    inner_color = "rgb(91, 96, 120)";
+      #    outer_color = "rgb(24, 25, 38)";
+      #    outline_thickness = 5;
+      #    #placeholder_text = '\'<span foreground="##cad3f5">Password...</span>'\';
+      #    shadow_passes = 2;
+      #  }
+      #];
     };
   };
 }
diff --git a/home-manager/stvnliu/nixvim/lsp.nix b/home-manager/stvnliu/nixvim/lsp.nix
index 4b61e59..6b84bb2 100644
--- a/home-manager/stvnliu/nixvim/lsp.nix
+++ b/home-manager/stvnliu/nixvim/lsp.nix
@@ -32,7 +32,10 @@
         };
 
         # Haskell
-        hls.enable = true;
+        hls = {
+          enable = true;
+          installGhc = false;
+        };
 
         # For TypeScript
         ts_ls.enable = true;
diff --git a/home-manager/stvnliu/packages/office-programs.nix b/home-manager/stvnliu/packages/office-programs.nix
index 56fcba0..c34d033 100644
--- a/home-manager/stvnliu/packages/office-programs.nix
+++ b/home-manager/stvnliu/packages/office-programs.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   home.packages = with pkgs; [
-    libreoffice-fresh
+    libreoffice
     kdePackages.okular
   ];
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 91ceba0..89b1142 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -21,6 +21,7 @@
   environment.sessionVariables = {
     GDK_SCALE = config.displayScale;
     FLAKE = config.myConfigLocation;
+    MANPAGER = "$EDITOR +Man!";
     # GTK_IM_MODULE = lib.mkForce "";
   };
   services.pcscd.enable = true;
@@ -151,7 +152,7 @@
   in {
     settings = {
       experimental-features = "nix-command flakes";
-      flake-registry = "";
+      # flake-registry = "";
       nix-path = config.nix.nixPath;
     };
     extraOptions = ''
@@ -161,9 +162,13 @@
     registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
+
+  systemd.network.wait-online.enable = false;
   networking = {
     hostName = "${config.myHostName}";
     networkmanager.enable = true;
+    useNetworkd = lib.mkDefault true;
+    useDHCP = lib.mkDefault true;
   };
   users.users = {
     "${config.myUserName}" = {