From d997e8d28a3c7e27a81625db071fbc1c65ea8704 Mon Sep 17 00:00:00 2001 From: xnm Date: Mon, 15 Apr 2024 22:03:09 +0300 Subject: [PATCH] fixes changelog: - wezterm always starts as new process now - deleted `hardware-configuration.nix` - added some fetchers - commented `nur` - disabled `opengl` - added qt theme inherited from gtk - removed deprecated notes about Yubikey from the README --- README.md | 4 +-- home/.config/hypr/hyprland.conf | 2 +- nixos/hardware-configuration.nix | 44 -------------------------------- nixos/info-fetchers.nix | 2 ++ nixos/nixpkgs.nix | 10 ++++---- nixos/services.nix | 1 - nixos/theme.nix | 3 +++ 7 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 nixos/hardware-configuration.nix diff --git a/README.md b/README.md index bb246c0..0870fcc 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This repository houses my NixOS Linux ❄️ flake configuration, featuring the This system leverages cutting-edge channels and versions of software to provide you with the latest updates and features. Notably, it utilizes: - **flake** (An experimental feature of the Nix package manager) -- **nur** (The Nix User Repository) +- ~~**nur** (The Nix User Repository)~~ *currently disabled - **nixpkgs**: unstable - **rust**: nightly version @@ -271,8 +271,6 @@ This repo contains a NixOS configuration file (`nixos/yubikey.nix`) enabling: 🛡️ For enhanced security and a passwordless experience: You can consider a YubiKey Bio Series device. These keys support FIDO2/WebAuthn and FIDO U2F and has built in fingerprint scanner for strong authentication. Please note, they do not offer Smart card, OpenPGP, or OTP functionality. -⚠️ Important Note: From personal experience, YubiKey integration on NixOS can sometimes be buggy or unstable. Experiment with caution, especially when combining different configurations and Linux programs. - ## 📜 License This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf index 212ecc1..9087e71 100644 --- a/home/.config/hypr/hyprland.conf +++ b/home/.config/hypr/hyprland.conf @@ -207,7 +207,7 @@ bind = $mainMod, M, exec, pypr toggle_minimized bind = $mainMod CTRL, E, exec, pypr expose bind = $mainMod, Z, exec, pypr zoom -bind = $mainMod, T, exec, wezterm +bind = $mainMod, T, exec, wezterm start --always-new-process bind = $mainMod SHIFT, T, exec, telegram-desktop bind = $mainMod, B, exec, qutebrowser bind = $mainMod SHIFT, B, exec, brave diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix deleted file mode 100644 index da19e83..0000000 --- a/nixos/hardware-configuration.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; # Disable NVIDIA video cards - boot.kernelParams = [ "i915.enable_guc=2" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - # FIXME: Use your auto-generated `hardware-configuration.nix` instead of this file, you can tweak your `hardware-configuration.nix` using snippets from this file - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - }; - hardware.opengl = { - enable = true; - driSupport = true; - extraPackages = with pkgs; [ - intel-compute-runtime - intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - vaapiVdpau - libvdpau-va-gl - ]; - }; -} diff --git a/nixos/info-fetchers.nix b/nixos/info-fetchers.nix index 1d5433f..bb1f2ad 100644 --- a/nixos/info-fetchers.nix +++ b/nixos/info-fetchers.nix @@ -6,11 +6,13 @@ onefetch ipfetch cpufetch + ramfetch starfetch octofetch htop bottom btop + zfxtop kmon # vulkan-tools diff --git a/nixos/nixpkgs.nix b/nixos/nixpkgs.nix index 64e32b0..be297e9 100644 --- a/nixos/nixpkgs.nix +++ b/nixos/nixpkgs.nix @@ -5,9 +5,9 @@ nixpkgs.config.allowUnfree = true; # Override packages - nixpkgs.config.packageOverrides = pkgs: { - nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { - inherit pkgs; - }; - }; + # nixpkgs.config.packageOverrides = pkgs: { + # nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { + # inherit pkgs; + # }; + # }; } diff --git a/nixos/services.nix b/nixos/services.nix index f568eb7..3db1cb6 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -23,7 +23,6 @@ services.tumbler.enable = true; services.fwupd.enable = true; services.auto-cpufreq.enable = true; - hardware.opengl.enable = true; # services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; environment.systemPackages = with pkgs; [ diff --git a/nixos/theme.nix b/nixos/theme.nix index bfc2352..7174d91 100644 --- a/nixos/theme.nix +++ b/nixos/theme.nix @@ -5,6 +5,9 @@ environment.variables.GTK_THEME = "Catppuccin-Macchiato-Standard-Teal-Dark"; environment.variables.XCURSOR_THEME = "Catppuccin-Macchiato-Teal"; environment.variables.XCURSOR_SIZE = "24"; + qt.enable = true; + qt.platformTheme = "gtk2"; + qt.style = "gtk2"; console = { earlySetup = true; colors = [