From c363306635b7010d33339fda447d1202194b09ab Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 03:21:29 +0300 Subject: [PATCH] try this for now --- config/colorscheme.nix | 14 ++++++++++++++ config/default.nix | 19 ++++++++++++------- config/options.nix | 7 +++++++ default.nix | 26 ++++++++++++++++++++++++++ flake.nix | 2 +- 5 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 config/colorscheme.nix create mode 100644 config/options.nix create mode 100644 default.nix diff --git a/config/colorscheme.nix b/config/colorscheme.nix new file mode 100644 index 0000000..6b7cfed --- /dev/null +++ b/config/colorscheme.nix @@ -0,0 +1,14 @@ +{ + colorschemes = { + catppuccin = { + enable = true; + + settings = { + flavour = "mocha"; + + # Needed to keep terminal transparency, if any + transparent_background = false; + }; + }; + }; +} \ No newline at end of file diff --git a/config/default.nix b/config/default.nix index a92b6dd..1cfc556 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,9 +1,14 @@ -{ - options = { - # Enable relative line numbers - number = true; - relativenumber = true; +{ lib, ... }: - }; -} +let + definitions = lib.attrNames ( + lib.filterAttrs + (filename: kind: + filename != "default.nix" + && (kind == "regular" || kind == "directory") + ) + (builtins.readDir ./.) + ); +in +lib.mkMerge (map (file: import ./${file}) definitions) \ No newline at end of file diff --git a/config/options.nix b/config/options.nix new file mode 100644 index 0000000..a4d8931 --- /dev/null +++ b/config/options.nix @@ -0,0 +1,7 @@ +{ + opts = { + # Enable relative line numbers + number = true; + relativenumber = true; + }; +} \ No newline at end of file diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..b916268 --- /dev/null +++ b/default.nix @@ -0,0 +1,26 @@ +_: + +{ + imports = [ + ./config + # ./plugins + ]; + + config = { + # Use as leader key + # globals.mapleader = " "; + + # Set 'vi' and 'vim' aliases to nixvim + viAlias = true; + vimAlias = true; + + # Setup clipboard support + clipboard = { + # Use xsel as clipboard provider + # providers.xsel.enable = true; + + # Sync system clipboard + register = "unnamedplus"; + }; + }; +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 71c5291..3a956f0 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ nixvim.legacyPackages.${system}.makeNixvimWithModule { inherit pkgs; - module = ./config; + module = ./.; extraSpecialArgs = specialArgs // { inherit pkgs;