diff --git a/helix/settings.nix b/helix/settings.nix index 0d43276..066c962 100644 --- a/helix/settings.nix +++ b/helix/settings.nix @@ -1,12 +1,50 @@ -{ pkgs, ... }: -let myConfig = import ./config.nix; -in -{ - package = pkgs.helix; +{ pkgs, ... }: { enable = true; package = pkgs.unstable.helix; settings = { theme = "catppuccin_frappe"; - editor = { auto-completion = true; auto-format = true; }; + keys = { + normal = { + w = ":w"; + q = ":q"; + }; + }; + editor = { + auto-completion = true; + auto-format = true; + }; }; + languages = [ + { + name = "html"; + language-server = { command = "html-languageserver"; }; + formatter = { + command = "prettier"; + args = [ "--parser" "html" ]; + }; + } + { + name = "scss"; + language-server = { command = "css-languageserver"; }; + formatter = { + command = "prettier"; + args = [ "--parser" "scss" ]; + }; + } + { + name = "css"; + language-server = { + command = "css-languageserver"; + args = [ "--stdio" ]; + }; + formatter = { + command = "prettier"; + args = [ "--parser" "scss" ]; + }; + } + { + name = "nix"; + formatter = { command = "nixfmt"; }; + } + ]; } diff --git a/meow.css b/meow.css new file mode 100644 index 0000000..bb4f590 --- /dev/null +++ b/meow.css @@ -0,0 +1,8 @@ +* { + color: black; +} + +* { + color: black; + background: white; +} diff --git a/user.nix b/user.nix index c51c193..cd75c69 100644 --- a/user.nix +++ b/user.nix @@ -1,24 +1,21 @@ { pkgs, users, config, inputs, supercolor, kaokao, i3layouts-rofi, ... }: let - my-python-packages = p: with p; [ - i3ipc - ( - buildPythonPackage rec { + my-python-packages = p: + with p; [ + i3ipc + (buildPythonPackage rec { pname = "i3-layouts"; version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "f16416b4f2b039c4e90f816a121e3fe56064569791b6324f1d1ec9e9e7861d47"; + sha256 = + "f16416b4f2b039c4e90f816a121e3fe56064569791b6324f1d1ec9e9e7861d47"; }; doCheck = false; - propagatedBuildInputs = [ - pkgs.unstable.python311Packages.i3ipc - ]; - } - ) - ]; -in -{ + propagatedBuildInputs = [ pkgs.unstable.python311Packages.i3ipc ]; + }) + ]; +in { # Define a user account. Don't forget to set a password with ‘passwd’. users.users.zoe = { shell = pkgs.fish; @@ -66,7 +63,6 @@ in kdenlive vulkan-tools - # images feh gnome.eog @@ -125,14 +121,14 @@ in ## nix any-nix-shell nixfmt - rnix-lsp + nil ## js nodejs nodePackages.prettier unstable.nodePackages.typescript-language-server nodePackages.live-server - nodePackages.vscode-html-languageserver-bin - nodePackages.vscode-css-languageserver-bin + unstable.nodePackages_latest.vscode-html-languageserver-bin + unstable.nodePackages_latest.vscode-css-languageserver-bin ## rust rust-analyzer rustup