From ee374b1f17df726948415577fa4a82d78f03569b Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Tue, 25 Aug 2026 01:30:59 -0500 Subject: [PATCH] push --- modules/core/autocpufreq.nix | 6 +++- modules/core/desktop/niri.nix | 34 ++++++++++++++++----- modules/core/theme/catppuccin.nix | 4 +++ modules/core/theme/stylix.nix | 5 +++- modules/hosts/box.nix | 5 ++++ modules/hosts/defaults.nix | 2 ++ modules/software/fish.nix | 1 - modules/software/llm/opencode.nix | 45 +++++++++++++++------------- modules/software/utilities/fetch.nix | 1 - 9 files changed, 70 insertions(+), 33 deletions(-) diff --git a/modules/core/autocpufreq.nix b/modules/core/autocpufreq.nix index 2d763b7..b07165e 100644 --- a/modules/core/autocpufreq.nix +++ b/modules/core/autocpufreq.nix @@ -1,6 +1,10 @@ -{ +{ inputs, ...}: { den.aspects.autocpufreq = { nixos = { + imports = [ inputs.auto-cpufreq.nixosModules.default ]; + + services.power-profiles-daemon.enable = false; + programs.auto-cpufreq.enable = true; programs.auto-cpufreq.settings = { diff --git a/modules/core/desktop/niri.nix b/modules/core/desktop/niri.nix index 6d1ad40..ca810fc 100644 --- a/modules/core/desktop/niri.nix +++ b/modules/core/desktop/niri.nix @@ -10,6 +10,10 @@ imports = [ inputs.niri.homeModules.niri ]; nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + home.packages = with pkgs; [ + xwayland-satellite + ]; + programs.niri = { enable = true; package = pkgs.niri; @@ -20,7 +24,7 @@ ]; input.keyboard = { - xkb.layout = "us,ua"; + xkb.layout = "us"; }; input.touchpad = { @@ -76,34 +80,39 @@ binds = { "Mod+T".action.spawn = "cosmic-term"; + "Mod+E".action.spawn = "cosmic-files"; + "Mod+A".action.spawn-sh = "noctalia msg panel-toggle launcher"; "Mod+V".action.spawn-sh = "noctalia msg panel-toggle clipboard"; "Mod+N".action.spawn-sh = "noctalia msg panel-toggle control-center"; + "Mod+C".action.spawn-sh = "noctalia msg panel-toggle alexander/mimir:chat"; + "Mod+W".action.spawn-sh = "noctalia msg panel-toggle wallpaper"; + "Mod+Comma".action.spawn-sh = "noctalia msg settings-toggle"; "Control+Alt+Delete".action.spawn-sh = "noctalia msg panel-toggle session"; + "XF86AudioRaiseVolume".action.spawn-sh = "noctalia msg volume-up"; "XF86AudioLowerVolume".action.spawn-sh = "noctalia msg volume-down"; "XF86AudioMute".action.spawn-sh = "noctalia msg volume-mute"; "XF86MonBrightnessUp".action.spawn-sh = "noctalia msg brightness-up"; "XF86MonBrightnessDown".action.spawn-sh = "noctalia msg brightness-down"; - # Media + "XF86AudioPlay".action.spawn = [ "playerctl" "play-pause" ]; "XF86AudioNext".action.spawn = [ "playerctl" "next" ]; "XF86AudioPrev".action.spawn = [ "playerctl" "previous" ]; "XF86AudioStop".action.spawn = [ "playerctl" "stop" ]; - "Mod+W".action.spawn-sh = "noctalia msg panel-toggle wallpaper"; - # Window management + "Mod+Q".action.close-window = {}; "Mod+Space".action.toggle-window-floating = {}; "Mod+Shift+Space".action.switch-focus-between-floating-and-tiling = {}; "Mod+F".action.switch-preset-column-width = {}; "Mod+Shift+F".action.fullscreen-window = {}; - # Focus + "Mod+Left".action.focus-column-left = {}; "Mod+Down".action.focus-window-or-workspace-down = {}; "Mod+Up".action.focus-window-or-workspace-up = {}; "Mod+Right".action.focus-column-right = {}; - # Move windows + "Mod+Shift+Left".action.set-column-width = "-10%"; "Mod+Shift+Right".action.set-column-width = "+10%"; "Mod+Shift+Up".action.set-window-height = "+10%"; @@ -112,9 +121,9 @@ "Mod+Control+L".action.consume-or-expel-window-right = {}; "Mod+Control+K".action.move-window-up = {}; "Mod+Control+J".action.move-window-down = {}; - # Screenshots + "Mod+Shift+S".action.spawn = [ "noctalia" "msg" "screenshot-region" ]; - # Workspaces + "Mod+1".action.focus-workspace = 1; "Mod+2".action.focus-workspace = 2; "Mod+3".action.focus-workspace = 3; @@ -136,6 +145,15 @@ "Mod+Shift+8".action.move-window-to-workspace = 8; "Mod+Shift+9".action.move-window-to-workspace = 9; "Mod+Shift+0".action.move-window-to-workspace = 10; + + "Alt+Tab".action.spawn-sh = "noctalia msg window-switcher"; + + "Mod+WheelScrollUp".action.focus-workspace-up = {}; + "Mod+WheelScrollDown".action.focus-workspace-down = {}; + "Mod+Shift+WheelScrollDown".action.focus-column-right = {}; + "Mod+Shift+WheelScrollUp".action.focus-column-left = {}; + "Mod+Ctrl+Shift+WheelScrollDown".action.move-column-right = {}; + "Mod+Ctrl+Shift+WheelScrollUp".action.move-column-left = {}; }; }; }; diff --git a/modules/core/theme/catppuccin.nix b/modules/core/theme/catppuccin.nix index ccf4d37..46c6bac 100644 --- a/modules/core/theme/catppuccin.nix +++ b/modules/core/theme/catppuccin.nix @@ -8,6 +8,8 @@ in { catppuccin = { enable = true; + autoEnable = true; + flavor = flavor; accent = accent; @@ -21,6 +23,8 @@ in { catppuccin = { enable = true; + autoEnable = true; + flavor = flavor; accent = accent; diff --git a/modules/core/theme/stylix.nix b/modules/core/theme/stylix.nix index 91ff7ae..f84102b 100644 --- a/modules/core/theme/stylix.nix +++ b/modules/core/theme/stylix.nix @@ -26,7 +26,8 @@ stylix = { enable = true; - autoEnable = false; + autoEnable = true; + polarity = "dark"; base16Scheme = catppuccin; @@ -40,8 +41,10 @@ vesktop.enable = true; gnome.enable = true; gtk.enable = true; + gtk.flatpakSupport.enable = true; firefox.enable = true; fish.enable = true; + opencode.enable = false; }; }; }; diff --git a/modules/hosts/box.nix b/modules/hosts/box.nix index 9c86270..30a8600 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -38,6 +38,11 @@ hashedPasswordFile = "/home/bug/users/levi.passwd"; }; + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + fileSystems."/home" = { device = "/dev/disk/by-uuid/30f357aa-fc86-4bcd-bed7-c91fc8afbdbc"; fsType = "ext4"; diff --git a/modules/hosts/defaults.nix b/modules/hosts/defaults.nix index cadb926..a635779 100644 --- a/modules/hosts/defaults.nix +++ b/modules/hosts/defaults.nix @@ -14,6 +14,8 @@ fish fetch + + opencode ]; nixos = { ... }: { diff --git a/modules/software/fish.nix b/modules/software/fish.nix index 9140f45..338f5ff 100644 --- a/modules/software/fish.nix +++ b/modules/software/fish.nix @@ -24,7 +24,6 @@ }; environment.systemPackages = with pkgs.fishPlugins; [ - done sponge ]; }; diff --git a/modules/software/llm/opencode.nix b/modules/software/llm/opencode.nix index d9c04ce..b5135b7 100644 --- a/modules/software/llm/opencode.nix +++ b/modules/software/llm/opencode.nix @@ -1,25 +1,28 @@ -{ pkgs, lib, ... }: - -let - opencode-json = pkgs.writeText "opencode.json" (builtins.toJSON { - "$schema" = "https://opencode.ai/config.json"; - plugin = [ "opencode-plugin-llama.cpp@latest" ]; - provider = { - llama.cpp = { - npm = "@ai-sdk/openai-compatible"; - name = "llama.cpp"; - options.baseURL = "https://llama.bug.tools/v1"; - models."qwen3.6-35b-a3b".name = "qwen3.6-35b-a3b"; - }; - }; - }); -in { +{ den.aspects.opencode = { - nixos = { pkgs, ... }: { - environment.systemPackages = [ pkgs.opencode ]; - }; - homeManager = { ... }: { - home.file.".config/opencode/opencode.json".source = opencode-json; + homeManager = { + programs.opencode = { + enable = true; + + settings = { + plugin = [ "opencode-plugin-llama.cpp@latest" ]; + + provider = { + "llama.cpp" = { + npm = "@ai-sdk/openai-compatible"; + name = "llama.cpp"; + options = { + baseURL = "https://llama.bug.tools/v1"; + }; + models = { + "qwen3.6-35b-a3b" = { + name = "qwen3.6-35b-a3b"; + }; + }; + }; + }; + }; + }; }; }; } diff --git a/modules/software/utilities/fetch.nix b/modules/software/utilities/fetch.nix index 4e52800..7dd4de7 100644 --- a/modules/software/utilities/fetch.nix +++ b/modules/software/utilities/fetch.nix @@ -14,7 +14,6 @@ "shell" "display" "wm" - "terminal" "cpu" "gpu" "memory"