return to stable

checklog:
1. change `mainline` kernel to `liquorix` kernel
2. change `hyprland` from 'flake\dev' version to 'stable' version
3. update cargo packages

README.md

@@ -5,8 +5,8 @@
 
 ![nixos](https://img.shields.io/badge/NixOS-24273A.svg?style=flat&logo=nixos&logoColor=CAD3F5)
 ![nixpkgs](https://img.shields.io/badge/nixpkgs-unstable-informational.svg?style=flat&logo=nixos&logoColor=CAD3F5&colorA=24273A&colorB=8aadf4)
-![linux kernel](https://img.shields.io/badge/linux_kernel-mainline-informational.svg?style=flat&logo=linux&logoColor=f4dbd6&colorA=24273A&colorB=b7bdf8)
+![linux kernel](https://img.shields.io/badge/kernel-liquorix-informational.svg?style=flat&logo=linux&logoColor=f4dbd6&colorA=24273A&colorB=b7bdf8)
-![hyprland](https://img.shields.io/badge/hyprland-development-informational.svg?style=flat&logo=wayland&logoColor=eed49f&colorA=24273A&colorB=91d7e3)
+![hyprland](https://img.shields.io/badge/hyprland-stable-informational.svg?style=flat&logo=wayland&logoColor=eed49f&colorA=24273A&colorB=91d7e3)
 ![rust](https://img.shields.io/badge/rust-nightly-informational.svg?style=flat&logo=rust&logoColor=f5a97f&colorA=24273A&colorB=f5a97f)
 
 </div>
@@ -32,8 +32,6 @@ This repository houses my NixOS Linux configuration, featuring the Hyprland wind
 This system leverages cutting-edge channels and versions of software to provide you with the latest updates and features. Notably, it utilizes:
 
 - **nixpkgs**: unstable
-- **hyprland**: development version
-- **linux kernel**: mainline
 - **rust**: nightly version
 
 This approach ensures that you stay on the forefront of technology, receiving the most recent software advancements promptly. 🚨However, it's important to note that this emphasis on bleeding-edge software may impact the stability of the system.
@@ -59,7 +57,7 @@ The showcased images do not reflect the latest version of the system's appearanc
 | Component             | Version/Name                |
 |-----------------------|-----------------------------|
 | Distro                | NixOS                       |
-| Kernel                | Mainline                    |
+| Kernel                | Liquorix                    |
 | Shell                 | Fish                        |
 | Display Server        | Wayland                     |
 | WM (Compositor)       | Hyprland                    |
@@ -199,6 +197,7 @@ Here are some tips to enhance your Rust experience on this system:
 4. **Cargo and Rust Tools:**
    This system comes equipped with a variety of cargo and rust tools to ensure a smooth Rust development experience. Some of these tools include:
    - `rust-analyzer`
+   - `cargo-watch`
    - `cargo-deny`
    - `cargo-audit`
    - `cargo-update`

home/.cargo/.crates.toml

@@ -1,6 +1,7 @@
 [v1]
 "cargo-contract 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-contract"]
-"cargo-dylint 2.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-dylint"]
+"cargo-dylint 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-dylint"]
-"contracts-node 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["substrate-contracts-node"]
+"contracts-node 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["substrate-contracts-node"]
-"dylint-link 2.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = ["dylint-link"]
+"dylint-link 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["dylint-link"]
 "ink-lsp-server 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = ["ink-lsp-server"]
+"spacetimedb-cli 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = ["spacetime"]

home/.config/fish/config.fish

@@ -9,7 +9,7 @@ alias conf="z ~/.config"
 alias nixos="z /etc/nixos"
 alias store="z /nix/store"
 alias nswitch="sudo nixos-rebuild switch --flake /etc/nixos"
-alias nswitchu="sudo nixos-rebuild switch --flake /etc/nixos --update-input nixpkgs --update-input rust-overlay --update-input hyprland --commit-lock-file --upgrade "
+alias nswitchu="sudo nixos-rebuild switch --flake /etc/nixos --update-input nixpkgs --update-input rust-overlay --commit-lock-file --upgrade"
 alias ncsu="sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos"
 alias nsgc="sudo nix-store --gc"
 alias ncg="sudo nix-collect-garbage -d"

nixos/configuration.nix

@@ -6,7 +6,7 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
       ./hardware-configuration.nix
     ];
 
@@ -19,10 +19,6 @@
   boot.initrd.systemd.enable = true;
   boot.plymouth = {
     enable = true;
-    # logo = pkgs.fetchurl {
-    #         url = "https://pluspng.com/img-png/black-lagoon-png-revy-1-png-1594-1080-anime-boysdjblack-lagoon-1594.png";
-    #         sha256 = "e0CZmXTVIJv6BDXXYksTsncl9t/QGkYC/BavNy4fcnQ=";
-    #       };
     font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
     themePackages = [ pkgs.catppuccin-plymouth ];
     theme = "catppuccin-macchiato";
@@ -48,21 +44,10 @@
   };
 
   # # Enable Hyprland
-  programs.hyprland = {
+  programs.hyprland.enable = true;
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  };
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
   environment.sessionVariables.WLR_NO_HARDWARE_CURSORS = "1";
 
-  # services.xserver.enable = true;
-  # services.xserver.displayManager.lightdm.enable = true;
-  # services.xserver.displayManager.lightdm.greeters.enso.enable = true;
-  # services.xserver.displayManager.lightdm.greeters.enso.theme.name = "Catppuccin-Teal-Dark";
-  # services.xserver.displayManager.lightdm.greeters.enso.iconTheme.name = "Colloid-teal-dark";
-  # services.xserver.displayManager.lightdm.greeters.enso.cursorTheme.name = "Catppuccin-Macchiato-Teal-Cursors";
-  # services.xserver.displayManager.lightdm.background = "$HOME/.config/wezterm/lain.png";
-
   # Enable Gnome
   # services.xserver.enable = true;
   # services.xserver.displayManager.gdm.enable = true;
@@ -132,8 +117,6 @@
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];    
     auto-optimise-store = true;
-    substituters = ["https://hyprland.cachix.org"];
-    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
   };
   
   # Optimize storage and automatic scheduled GC running
@@ -159,14 +142,14 @@
     enable = true;
     operation = "switch"; # If you don't want to apply updates immediately, only after rebooting, use `boot` option in this case
     flake = "/etc/nixos";
-    flags = [ "--update-input" "nixpkgs" "--update-input" "rust-overlay" "--update-input" "hyprland" "--commit-lock-file" ];
+    flags = [ "--update-input" "nixpkgs" "--update-input" "rust-overlay" "--commit-lock-file" ];
     dates = "daily";
     # channel = "https://nixos.org/channels/nixos-unstable";
   };
 
 
   # Linux Kernel
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_testing;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_lqx;
   boot.kernelParams = [ 
     "quiet"
     "fbcon=nodefer"
@@ -534,6 +517,7 @@
     (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
     evcxr #rust repl
     taplo #toml formatter & lsp
+    cargo-watch
     cargo-deny
     cargo-audit
     cargo-update

nixos/flake.nix

@@ -4,7 +4,6 @@
   inputs = {
       nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
       rust-overlay.url = "github:oxalica/rust-overlay";
-      hyprland.url = "github:hyprwm/Hyprland";
   };
 
   outputs = { nixpkgs, ... } @ inputs: