From d13e83b9fe658c20d100ff294596eeb36c924b01 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 2 May 2025 03:12:08 +0300 Subject: [PATCH 1/6] feat: fix starship build --- modules/common/nushell/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/common/nushell/default.nix b/modules/common/nushell/default.nix index c36f193..8e8005a 100644 --- a/modules/common/nushell/default.nix +++ b/modules/common/nushell/default.nix @@ -57,6 +57,11 @@ in { inherit (self.starship) src; hash = "sha256-nH1iYjKw/GbYKadoymH3onWBbMzuMUaRCSTNWVE+A9E="; }; + + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.cmake + pkgs.zlib-ng + ]; }); })]; From f8221c9545fa0e67f0c12bfb07864dbe4bc8fce7 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 2 May 2025 03:32:15 +0300 Subject: [PATCH 2/6] feat: fix stupidity --- modules/common/nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common/nix.nix b/modules/common/nix.nix index bc60bb7..84ab9af 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -46,7 +46,7 @@ in { |> (if config.isLinux && config.services.nix-serve.enable then (cfg: cfg // { extra-substituters = cfg.extra-substituters - |> filter (x: match ".*cache.rgbcu.be.*" x != null); + |> filter (x: match ".*cache.rgbcu.be.*" x == null); }) else id); From 87b234f735b6da21f03fc54046592e132bd9d673 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 2 May 2025 03:33:19 +0300 Subject: [PATCH 3/6] feat: idk --- modules/common/nix.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/common/nix.nix b/modules/common/nix.nix index 84ab9af..a5ca627 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -42,14 +42,14 @@ in { |> mapAttrs (_: flake: { inherit flake; }); nix.settings = (import <| self + /flake.nix).nixConfig - |> flip removeAttrs (optionals config.isDarwin [ "use-cgroups" ]) - |> (if config.isLinux && config.services.nix-serve.enable then - (cfg: cfg // { - extra-substituters = cfg.extra-substituters - |> filter (x: match ".*cache.rgbcu.be.*" x == null); - }) - else - id); + |> flip removeAttrs (optionals config.isDarwin [ "use-cgroups" ]); + # |> (if config.isLinux && config.services.nix-serve.enable then + # (cfg: cfg // { + # extra-substituters = cfg.extra-substituters + # |> filter (x: match ".*cache.rgbcu.be.*" x == null); + # }) + # else + # id); nix.optimise.automatic = true; From c2a212857dd13c8bb8d5effbfff7a43ce608aa50 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 2 May 2025 03:49:11 +0300 Subject: [PATCH 4/6] feat: use markdown-oxide --- modules/common/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common/helix.nix b/modules/common/helix.nix index d13e06f..edc08eb 100644 --- a/modules/common/helix.nix +++ b/modules/common/helix.nix @@ -209,7 +209,7 @@ in { lua-language-server # MARKDOWN - marksman + markdown-oxide # NIX nixfmt-rfc-style From 1f4a1662584116fdbf4fe87de21ecfb0c6c7c1e4 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 2 May 2025 03:49:11 +0300 Subject: [PATCH 5/6] feat: don't invert fn keys --- modules/darwin/paperwm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/darwin/paperwm.nix b/modules/darwin/paperwm.nix index 070f035..bff5a14 100644 --- a/modules/darwin/paperwm.nix +++ b/modules/darwin/paperwm.nix @@ -18,7 +18,7 @@ in { NSScrollAnimationEnabled = true; NSWindowResizeTime = 0.001; - # "com.apple.keyboard.fnState" = true; # Invert Fn. + "com.apple.keyboard.fnState" = false; # Don't invert Fn. "com.apple.trackpad.scaling" = 1.5; # Faster mouse speed. InitialKeyRepeat = 15; From a76927f6002320ba5e53847b65a6702731d0e82d Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 2 May 2025 04:01:41 +0300 Subject: [PATCH 6/6] feat: use linux zen for desktop --- flake.nix | 4 ++-- modules/linux/kernel.nix | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index e62c252..96a0973 100644 --- a/flake.nix +++ b/flake.nix @@ -3,17 +3,17 @@ nixConfig = { extra-substituters = [ + "https://cache.rgbcu.be/" "https://cache.garnix.io/" "https://cache.privatevoid.net" - "https://cache.rgbcu.be/" "https://hyprland.cachix.org/" "https://nix-community.cachix.org/" ]; extra-trusted-public-keys = [ + "cache.rgbcu.be:nBN/5Qg5E8GIYwaoslm9DYo2zeqlBiCVNCPf17djr+w=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" - "cache.rgbcu.be:nBN/5Qg5E8GIYwaoslm9DYo2zeqlBiCVNCPf17djr+w=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; diff --git a/modules/linux/kernel.nix b/modules/linux/kernel.nix index 0ca1079..50976d1 100644 --- a/modules/linux/kernel.nix +++ b/modules/linux/kernel.nix @@ -1,5 +1,8 @@ -{ pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_latest; +{ config, pkgs, ... }: { + boot.kernelPackages = if config.isServer then + pkgs.linuxPackages_latest + else + pkgs.linuxKernel.packages.linux_zen; # Credits: # - https://github.com/NotAShelf/nyx/blob/main/modules/core/common/system/security/kernel.nix