From 127b4e5535e0cc488cdae5a0659dec001513b5f0 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 29 Jan 2026 08:52:21 -0500 Subject: [PATCH] changes --- flake.lock | 17 +++++++++------- flake.nix | 2 ++ home/apps/librewolf.nix | 22 ++++++++++++++++++++ home/apps/vencord.nix | 4 ++-- home/games/morrowind.nix | 7 ++++++- home/terminal/fish.nix | 9 +++------ home/terminal/kitty.nix | 3 ++- home/tiling/niri.nix | 14 +++++++++---- home/tiling/noctalia.nix | 6 +++--- system/default.nix | 37 +++++++++++++++++++--------------- system/hosts/alien/default.nix | 5 ++++- system/hosts/peach/default.nix | 32 +++++++++++++++++------------ 12 files changed, 104 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 3e265e3..f63febd 100644 --- a/flake.lock +++ b/flake.lock @@ -237,16 +237,18 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": [ + "nixpkgs-stable" + ], "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769582851, - "narHash": "sha256-T2a9J3iZ+p+dSmrd8mGgehvXrzwnFlMF22BmBqYHkVg=", + "lastModified": 1769647464, + "narHash": "sha256-SDZms/fjrXRgL+QA+RfvTMClhPGfPn1TnIdNwoujEo4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8942525e9d5c79f6b47cffef4992454c9b3f9b69", + "rev": "e3d4bf00f7d40fca03fecab5c7a46277a6eb9fed", "type": "github" }, "original": { @@ -345,11 +347,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769318308, - "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { @@ -487,6 +489,7 @@ "niri": "niri", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", diff --git a/flake.nix b/flake.nix index abc54bf..7dc7eb7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; nix-cachyos-kernel = { @@ -38,6 +39,7 @@ niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs-stable"; # inputs.niri-stable.follows = "niri-blur"; # inputs.niri-unstable.follows = "niri-blur"; }; diff --git a/home/apps/librewolf.nix b/home/apps/librewolf.nix index 19b8f89..096b627 100644 --- a/home/apps/librewolf.nix +++ b/home/apps/librewolf.nix @@ -288,6 +288,28 @@ definedAliases = [ "@np" ]; }; + nix-options = { + name = "Nix Options"; + urls = [ + { + template = "https://search.nixos.org/options"; + params = [ + { + name = "type"; + value = "packages"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + } + ]; + + icon = nixIcon; + definedAliases = [ "@no" ]; + }; + nixos-wiki = { name = "NixOS Wiki"; urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ]; diff --git a/home/apps/vencord.nix b/home/apps/vencord.nix index eb19434..39f7123 100644 --- a/home/apps/vencord.nix +++ b/home/apps/vencord.nix @@ -198,8 +198,8 @@ ShowAllMessageButtons.enabled = false; ShowConnections.enabled = false; ShowHiddenChannels = { - enabled = false; - showMode = 0; + enabled = true; + showMode = 1; hideUnreads = true; defaultAllowedUsersAndRolesDropdownState = true; }; diff --git a/home/games/morrowind.nix b/home/games/morrowind.nix index 663b43d..5a006dc 100644 --- a/home/games/morrowind.nix +++ b/home/games/morrowind.nix @@ -4,5 +4,10 @@ ... }: { - home.packages = with pkgs; [ openmw ]; + home = { + packages = with pkgs; [ openmw ]; + sessionVariables = { + SDL_VIDEO_DRIVER = "wayland"; + }; + }; } diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix index 0639fa0..03f177e 100644 --- a/home/terminal/fish.nix +++ b/home/terminal/fish.nix @@ -1,13 +1,9 @@ -{ - config, - pkgs, - lib, - ... -}: +{ pkgs, ... }: { home.packages = with pkgs; [ kdePackages.qttools eza + pigz ]; programs.fish = { @@ -15,6 +11,7 @@ shellAliases = { ssh = "kitty-ssh"; cat = "bat"; + gzip = "pigz"; ls = "eza"; gl = "git log"; ga = "git add -v ."; diff --git a/home/terminal/kitty.nix b/home/terminal/kitty.nix index 9d99eda..cd36c36 100644 --- a/home/terminal/kitty.nix +++ b/home/terminal/kitty.nix @@ -113,9 +113,10 @@ in settings = { include = "/home/${config.userOptions.username}/.config/kitty/themes/kitty-colors.conf"; scrollback_lines = 10000; + wheel_scroll_multiplier = 5.0; + touch_scroll_multiplier = 5.0; enable_audio_bell = false; update_check_interval = 0; - wheel_scroll_multiplier = 10.0; confirm_os_window_close = 0; window_padding_width = 4; tab_bar_min_tabs = 2; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 038c451..842208b 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -132,10 +132,10 @@ window-rules = [ { geometry-corner-radius = { - top-left = 16.0; - top-right = 16.0; - bottom-left = 16.0; - bottom-right = 16.0; + top-left = 8.0; + top-right = 8.0; + bottom-left = 8.0; + bottom-right = 8.0; }; clip-to-geometry = true; opacity = 1.0; @@ -495,6 +495,12 @@ "Mod+Shift+Minus".action.set-window-height = "-10%"; "Mod+Shift+Equal".action.set-window-height = "+10%"; + "Mod+Ctrl+Minus".action.set-column-width = "-1%"; + "Mod+Ctrl+Equal".action.set-column-width = "+1%"; + + "Mod+Ctrl+Shift+Minus".action.set-window-height = "-1%"; + "Mod+Ctrl+Shift+Equal".action.set-window-height = "+1%"; + "Mod+V".action.toggle-window-floating = { }; "Mod+Shift+V".action.switch-focus-between-floating-and-tiling = { }; diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index 3ad65cf..58cdd25 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -15,7 +15,7 @@ mOnTertiary = base00; mError = base12; mOnError = base00; - mSurface = base00; + mSurface = "#000000"; mOnSurface = base05; mSurfaceVariant = base01; mOnSurfaceVariant = base05; @@ -35,7 +35,7 @@ backgroundOpacity = 1; monitors = [ ]; density = "spacious"; - showCapsule = true; + showCapsule = false; capsuleOpacity = 1; floating = false; marginVertical = 0.25; @@ -68,7 +68,7 @@ colorizeIcons = false; hideMode = "hidden"; id = "ActiveWindow"; - maxWidth = 500; + maxWidth = 600; scrollingMode = "always"; showIcon = true; useFixedWidth = false; diff --git a/system/default.nix b/system/default.nix index 4ea308f..998077b 100755 --- a/system/default.nix +++ b/system/default.nix @@ -17,28 +17,33 @@ boot = { plymouth = { enable = true; + logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png"; }; loader = { timeout = 3; - limine = { + systemd-boot = { enable = true; - maxGenerations = 3; - extraConfig = '' - timeout: 3 - ''; - style = { - wallpapers = [ ]; - backdrop = "#1e1e2e"; - interface = { - branding = "kova's nixos!"; - brandingColor = 5; - }; - }; - }; - efi = { - canTouchEfiVariables = false; + consoleMode = lib.mkForce "auto"; + configurationLimit = 10; }; + # limine = { + # enable = true; + # maxGenerations = 10; + # extraConfig = '' + # timeout: 3 + # ''; + # style = { + # wallpapers = [ ]; + # wallpaperStyle = "centered"; + # backdrop = "#1e1e2e"; + # interface = { + # branding = "kova's nixos!"; + # brandingColor = 5; + # }; + # }; + # }; + # efi.canTouchEfiVariables = true; }; kernelParams = [ "quiet" diff --git a/system/hosts/alien/default.nix b/system/hosts/alien/default.nix index 46ed96c..b433590 100644 --- a/system/hosts/alien/default.nix +++ b/system/hosts/alien/default.nix @@ -8,6 +8,7 @@ ddcutil mangohud (bottles.override { removeWarningPopup = true; }) + openrgb ]; # enable ddcutil @@ -22,7 +23,9 @@ ''; hardware.i2c.enable = true; - boot.loader.systemd-boot.consoleMode = "max"; + # enable rgb support + services.hardware.openrgb.enable = true; + # boot.kernelPackages = pkgs.linuxPackages; # let's use the CachyOS kernel instead! diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index e355c70..76d8105 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -1,25 +1,31 @@ { pkgs, config, + lib, ... }: +let + asahi-artwork = pkgs.fetchFromGitHub { + owner = "AsahiLinux"; + repo = "artwork"; + rev = "80d14f8b6f485b310e305a84b4b806361518ddd1"; + hash = "sha256-1r7gPFsn3GmKO4YsixsK7eyQWfVjsWnuOEtSCQequn8="; + }; +in { - boot.kernelParams = [ "appledrm.show_notch=1" ]; + boot = { + kernelParams = [ "appledrm.show_notch=1" ]; + m1n1CustomLogo = "${asahi-artwork}/logos/png_256/AsahiLinux_logomark.png"; + plymouth.logo = lib.mkForce "${asahi-artwork}/logos/png_64/AsahiLinux_logomark.png"; + }; - environment.systemPackages = with pkgs; [ - ddcutil + programs.dconf.profiles.gdm.databases = [ + { + settings."org/gnome/login-screen".logo = + "${asahi-artwork}/logos/svg/AsahiLinux_logo_horizontal_darkbg.svg"; + } ]; - boot.extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ]; - boot.kernelModules = [ - "i2c-dev" - "ddcci_backlight" - ]; - services.udev.extraRules = '' - KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660" - ''; - hardware.i2c.enable = true; - virtualisation.docker = { enable = true; # Use the rootless mode - run Docker daemon as non-root user