diff --git a/modules/style/colors.nix b/modules/style/colors.nix index 07934ae..8b6dcd9 100644 --- a/modules/style/colors.nix +++ b/modules/style/colors.nix @@ -35,7 +35,7 @@ in { name = mkOption { type = nullOr (enum ["Catppuccin Mocha" "Zenburn" "Black Metal Venom" "Gruvbox"]); description = "The colorscheme that should be used globally to theme your system."; - default = "Gruvbox"; + default = "Catppuccin Mocha"; }; slug = mkOption { diff --git a/modules/system/os/networking/networkmanager.nix b/modules/system/os/networking/networkmanager.nix index 187670c..3e36fd9 100644 --- a/modules/system/os/networking/networkmanager.nix +++ b/modules/system/os/networking/networkmanager.nix @@ -2,11 +2,6 @@ _: { networking.networkmanager = { enable = true; - unmanaged = [ - # DO NOT manage my docker containers, thank you. - "interface-name:docker*" - ]; - wifi = { # Generate a randomized value upon each connect macAddress = "random"; diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix index fa65c2b..624a0f3 100644 --- a/modules/wms/wayland/hyprland/settings.nix +++ b/modules/wms/wayland/hyprland/settings.nix @@ -47,10 +47,6 @@ in { }; }; - gestures = { - workspace_swipe = true; - }; - general = { layout = "dwindle"; gaps_in = 0; diff --git a/packages/helix/colorscheme.nix b/packages/helix/colorscheme.nix index 0419d13..e69de29 100644 --- a/packages/helix/colorscheme.nix +++ b/packages/helix/colorscheme.nix @@ -1,4 +0,0 @@ -{ - inherits = "gruvbox"; - "ui.background" = {}; -} diff --git a/packages/helix/default.nix b/packages/helix/default.nix index 29929c0..930d355 100644 --- a/packages/helix/default.nix +++ b/packages/helix/default.nix @@ -39,12 +39,8 @@ inherit (lib.meta) getExe; toml = formats.toml {}; - - helix-languages = callPackage ./languages.nix {inherit lib;}; - colorscheme = toml.generate "colorscheme.toml" (import ./colorscheme.nix); - helix-config = { - theme = "theme_transparent"; + theme = "catppuccin_mocha"; editor = { cursorline = false; color-modes = true; @@ -111,6 +107,7 @@ }; }; }; + helix-languages = callPackage ./languages.nix {inherit lib;}; wrapped-helix = symlinkJoin { name = "helix-wrapped"; paths = [ @@ -143,10 +140,9 @@ ]; nativeBuildInputs = [makeWrapper]; postBuild = '' - mkdir -p $out/config/helix/themes + mkdir -p $out/config/helix cp "${toml.generate "config.toml" helix-config}" $out/config/helix/config.toml cp "${helix-languages}" $out/config/helix/languages.toml - cp "${colorscheme}" $out/config/helix/themes/theme_transparent.toml wrapProgram $out/bin/hx --set \ XDG_CONFIG_HOME $out/config '';