From 286f58b614ec6088bd4c7d2d72035a7ae27ba2cd Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sun, 30 Aug 2026 21:57:18 +1000 Subject: [PATCH] swap to helix + reformat --- modules/home/terminal/helix.nix | 49 +++++++++++++++++++++++++ modules/home/terminal/neovim/neovim.nix | 13 ------- modules/misc/flake-parts.nix | 6 +++ modules/misc/hm-parts.nix | 3 ++ modules/system/core.nix | 19 ++++++---- 5 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 modules/home/terminal/helix.nix delete mode 100644 modules/home/terminal/neovim/neovim.nix diff --git a/modules/home/terminal/helix.nix b/modules/home/terminal/helix.nix new file mode 100644 index 0000000..70731cc --- /dev/null +++ b/modules/home/terminal/helix.nix @@ -0,0 +1,49 @@ +{ self, inputs, ... }: { + + flake.modules.homeManager.helix = { + + programs.helix = { + + enable = true; # enables helix + + settings = { + + # cursor settings + editor.cursor-shape = { + normal = "underline"; + insert = "bar"; + select = "block"; + }; + + # declare theme to use + theme = "onedarker_transparent"; + + }; + + # list of themes + themes = { + + # modified theme + onedarker_transparent = { + "inherits" = "onedarker"; + "ui.background" = { }; + }; + + }; + + # lsp settings + languages = { + + # nix + language = [ + { + name = "nix"; + auto-format = true; + formatter.command = lib.getExe pkgs.nxfmt; + } + ]; + + }; + }; + }; +} diff --git a/modules/home/terminal/neovim/neovim.nix b/modules/home/terminal/neovim/neovim.nix deleted file mode 100644 index e15c4cb..0000000 --- a/modules/home/terminal/neovim/neovim.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ self, inputs, ... }: { - - perSystem = { pkgs, ... }: { - - packages.myYazi = inputs.wrapper-modules.wrappers.yazi.wrap { - settings = { - foo = bar; - }; - }; - - }; - -} diff --git a/modules/misc/flake-parts.nix b/modules/misc/flake-parts.nix index 8afaa04..fdaac6f 100644 --- a/modules/misc/flake-parts.nix +++ b/modules/misc/flake-parts.nix @@ -1,7 +1,13 @@ { + + # misc flake-parts configuration config = { + + # uarchs to build for systems = [ "x86_64-linux" ]; + }; + } diff --git a/modules/misc/hm-parts.nix b/modules/misc/hm-parts.nix index d8d17ab..4d8f27a 100644 --- a/modules/misc/hm-parts.nix +++ b/modules/misc/hm-parts.nix @@ -1,6 +1,9 @@ { inputs, ... }: + { + # loads home manager modules imports = [ inputs.home-manager.flakeModules.home-manager ]; + } diff --git a/modules/system/core.nix b/modules/system/core.nix index 799fb64..49bd214 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -1,30 +1,35 @@ { self, lib, ... }: -# default configuration shared by all hosts + { + flake.nixosModules.coreConfig = { pkgs, ... }: { + + # other modules to load imports = [ self.nixosModules.audioConfig self.nixosModules.nixConfig self.nixosModules.corePackages ]; - documentation.dev.enable = true; + # compresses half the ram for use as swap + zramSwap.enable = true; + # locale settings i18n = { defaultLocale = "en_AU.UTF-8"; - # saves space supportedLocales = [ "en_AU.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ]; }; + # meanjin time + time.timeZone = lib.mkDefault "Austrlia/Brisbane"; + # don't touch this system.stateVersion = lib.mkDefault "24.11"; + documentation.dev.enable = true; - time.timeZone = lib.mkDefault "Australia/Brisbane"; - - # compresses half the ram for use as swap - zramSwap.enable = true; }; + }