From 8067765fec8b1ce1179ceea5fddd2493efda9180 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 21 Feb 2025 22:59:53 -0500 Subject: [PATCH] some small changes and etc --- flake.lock | 24 +++++++------- hosts/eddie/configuration.nix | 61 ++++++++++++++++++++++++----------- modules/home/yazi.nix | 1 - 3 files changed, 54 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index fbbc77e..41be482 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738370996, - "narHash": "sha256-HFDE+kODQc3eYDaJGbinxyBwPr/02LJvd9Gyewbuxtc=", + "lastModified": 1740179067, + "narHash": "sha256-LK1kY074RAttISPbeHIuR0mu2ZoA1drPNOPqir1rFtc=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "b77bfab85655365d516718d34ff93cd9308513b9", + "rev": "3934b165df19a91362e8ac530401aa2bd52e2441", "type": "github" }, "original": { @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740129365, - "narHash": "sha256-SN2R1HKQsVHq0O9/Ilyi7221kIXUjlQawuk9BhysnE8=", + "lastModified": 1740189964, + "narHash": "sha256-80FEyl0zRoBA3fnuJA1MtsZb3hI3WRFE5OFAYr6tLTA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "38cde30c151765ba64e8e7b0b47ec35ecbbbdb02", + "rev": "33b945739322cb13a351114563ffad9c4f67968c", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1740145731, - "narHash": "sha256-foYErxD5YuRCkRGUd5AcQjCrX7ELdPJr3+eYMfNmI4U=", + "lastModified": 1740188029, + "narHash": "sha256-pnPs+XSpR633G/q0gj+SDyL4RaDfiKlom86zEBPtq+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c82285348bc811b723014cf4dba2f87e7ffc885", + "rev": "765cb91e9d5ab06ed8c92c25fc0e51d6c11d43cb", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1740139654, - "narHash": "sha256-qbE78jjws1Az80vrD1+3lPIU6EGF3PpKa9pfvvC4nBQ=", + "lastModified": 1740150522, + "narHash": "sha256-SkH7Zm+ZgvyWpjGyqLq2PKbtxQ7YA2Q8v4OBxp8LbNw=", "owner": "sxyazi", "repo": "yazi", - "rev": "7f17ecd54708a728be42233db5619523ac73a8c8", + "rev": "52a5ab59e943447c0d6d4e04b7afffc1a4ab23f2", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 109f099..17bca30 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -64,26 +64,44 @@ i18n.defaultLocale = "en_CA.UTF-8"; console = { + earlySetup = true; colors = with pkgs.lib.nix-rice; let theme = palette.toRgbShortHex pkgs.rice.colorPalette; in with theme; [ - normal.black - normal.red - normal.green - normal.yellow - normal.blue - normal.magenta - normal.cyan - normal.white - bright.black - bright.red - bright.green - bright.yellow - bright.blue - bright.magenta - bright.cyan - bright.white + # normal.black + # normal.red + # normal.green + # normal.yellow + # normal.blue + # normal.magenta + # normal.cyan + # normal.white + # bright.black + # bright.red + # bright.green + # bright.yellow + # bright.blue + # bright.magenta + # bright.cyan + # bright.white + + "282c34" + "353b45" + "3e4451" + "545862" + "565c64" + "abb2bf" + "b6bdca" + "c8ccd4" + "e06c75" + "d19a66" + "e5c07b" + "98c379" + "56b6c2" + "61afef" + "c678dd" + "be5046" ]; }; @@ -121,12 +139,15 @@ # Bootloader. boot = { loader = { - systemd-boot.enable = true; - systemd-boot.configurationLimit = 8; + systemd-boot = { + enable = true; + configurationLimit = 8; + consoleMode = "max"; + }; efi.canTouchEfiVariables = true; }; kernelPackages = pkgs.linuxPackages_latest; - kernelModules = [ "i2c-dev" "ddcci-backlight" "amd_3d_vcache" "uinput" ]; + kernelModules = [ "i2c-dev" "ddcci-backlight" "amd_3d_vcache" "uinput" "amd_pstate=active" ]; extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ]; initrd.systemd.enable = true; initrd.kernelModules = [ @@ -179,6 +200,8 @@ pkgs.alsa-firmware ]; + amdgpu.initrd.enable = true; + nvidia = { open = true; # Modesetting is required. diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index a519dd1..1987f45 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -35,7 +35,6 @@ { on = "l"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; } { on = ""; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; } { on = ""; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; } - { on = ""; run = "remove"; } { on = ""; run = "remove"; } ]; };