diff --git a/README.md b/README.md index 75e5497..976a156 100644 --- a/README.md +++ b/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) -![hyprland](https://img.shields.io/badge/hyprland-development-informational.svg?style=flat&logo=wayland&logoColor=eed49f&colorA=24273A&colorB=91d7e3) +![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-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) @@ -32,11 +32,9 @@ 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. +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. 🚨Please note that the system utilizes **Podman** instead of **Docker** for containerization due to various reasons, primarily related to security (rootless and daemonless containers), easier migration to Kubernetes, availability of pods, compatibility with systemd, and better security for `distrobox`. If you prefer to use **Docker** instead of **Podman**, you can make the switch by commenting out the **Podman** section in the `configuration.nix` file and uncommenting the **Docker** section. More details on **Docker** configuration in NixOS can be found [here](https://nixos.wiki/wiki/Docker). @@ -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` diff --git a/home/.cargo/.crates.toml b/home/.cargo/.crates.toml index fe8d4f7..3515cef 100644 --- a/home/.cargo/.crates.toml +++ b/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"] -"contracts-node 0.33.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"] +"cargo-dylint 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["cargo-dylint"] +"contracts-node 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)" = ["substrate-contracts-node"] +"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"] diff --git a/home/.config/fish/config.fish b/home/.config/fish/config.fish index a62bc18..25d886c 100644 --- a/home/.config/fish/config.fish +++ b/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" diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 56e5dce..d97e531 100644 --- a/nixos/configuration.nix +++ b/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 = { - enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - }; + programs.hyprland.enable = true; 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 diff --git a/nixos/flake.nix b/nixos/flake.nix index 116a686..6c896e3 100644 --- a/nixos/flake.nix +++ b/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: