From 1c2fa46bce56dc42d84fc07cf1f90036fd207173 Mon Sep 17 00:00:00 2001 From: Kristian Krsnik Date: Sun, 27 Aug 2023 00:27:36 +0200 Subject: [PATCH] restructured and added font --- flake.nix | 2 +- home/default.nix => home.nix | 19 ++++++++++--------- {home => modules}/bash.nix | 0 {home => modules}/direnv.nix | 0 {home => modules}/firefox.nix | 0 modules/fonts.nix | 9 +++++++++ {home => modules}/git.nix | 0 {home => modules}/gnome.nix | 0 {home => modules}/nvim/cmp.lua | 0 {home => modules}/nvim/colors.lua | 0 {home => modules}/nvim/default.nix | 0 {home => modules}/nvim/fugitive.lua | 0 {home => modules}/nvim/keybinds.lua | 0 {home => modules}/nvim/lspconfig.lua | 0 {home => modules}/nvim/telescope.lua | 0 {home => modules}/nvim/treesitter.lua | 0 {home => modules}/nvim/undotree.lua | 0 {home => modules}/packages.nix | 1 - {home => modules}/thunderbird.nix | 0 {home => modules}/vscode.nix | 3 +++ 20 files changed, 23 insertions(+), 11 deletions(-) rename home/default.nix => home.nix (80%) rename {home => modules}/bash.nix (100%) rename {home => modules}/direnv.nix (100%) rename {home => modules}/firefox.nix (100%) create mode 100644 modules/fonts.nix rename {home => modules}/git.nix (100%) rename {home => modules}/gnome.nix (100%) rename {home => modules}/nvim/cmp.lua (100%) rename {home => modules}/nvim/colors.lua (100%) rename {home => modules}/nvim/default.nix (100%) rename {home => modules}/nvim/fugitive.lua (100%) rename {home => modules}/nvim/keybinds.lua (100%) rename {home => modules}/nvim/lspconfig.lua (100%) rename {home => modules}/nvim/telescope.lua (100%) rename {home => modules}/nvim/treesitter.lua (100%) rename {home => modules}/nvim/undotree.lua (100%) rename {home => modules}/packages.nix (94%) rename {home => modules}/thunderbird.nix (100%) rename {home => modules}/vscode.nix (95%) diff --git a/flake.nix b/flake.nix index c0caa64..b31f665 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ inherit pkgs; modules = [ - ./home + ./home.nix { _module.args.wallpaper = wallpaper.packages.${system}.default; } diff --git a/home/default.nix b/home.nix similarity index 80% rename from home/default.nix rename to home.nix index 6f604a9..15ab77d 100644 --- a/home/default.nix +++ b/home.nix @@ -21,15 +21,16 @@ targets.genericLinux.enable = false; # Enable on non-nixos ditros imports = [ - ./bash.nix - ./direnv.nix - ./firefox.nix - ./git.nix - ./gnome.nix - ./nvim - ./packages.nix - ./thunderbird.nix - ./vscode.nix + ./modules/bash.nix + ./modules/direnv.nix + ./modules/firefox.nix + ./modules/fonts.nix + ./modules/git.nix + ./modules/gnome.nix + ./modules/nvim + ./modules/packages.nix + ./modules/thunderbird.nix + ./modules/vscode.nix ]; # Programs diff --git a/home/bash.nix b/modules/bash.nix similarity index 100% rename from home/bash.nix rename to modules/bash.nix diff --git a/home/direnv.nix b/modules/direnv.nix similarity index 100% rename from home/direnv.nix rename to modules/direnv.nix diff --git a/home/firefox.nix b/modules/firefox.nix similarity index 100% rename from home/firefox.nix rename to modules/firefox.nix diff --git a/modules/fonts.nix b/modules/fonts.nix new file mode 100644 index 0000000..31b820d --- /dev/null +++ b/modules/fonts.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + config = { + fonts.fontconfig.enable = true; + + home.packages = with pkgs; [ + nerdfonts + ]; + }; +} diff --git a/home/git.nix b/modules/git.nix similarity index 100% rename from home/git.nix rename to modules/git.nix diff --git a/home/gnome.nix b/modules/gnome.nix similarity index 100% rename from home/gnome.nix rename to modules/gnome.nix diff --git a/home/nvim/cmp.lua b/modules/nvim/cmp.lua similarity index 100% rename from home/nvim/cmp.lua rename to modules/nvim/cmp.lua diff --git a/home/nvim/colors.lua b/modules/nvim/colors.lua similarity index 100% rename from home/nvim/colors.lua rename to modules/nvim/colors.lua diff --git a/home/nvim/default.nix b/modules/nvim/default.nix similarity index 100% rename from home/nvim/default.nix rename to modules/nvim/default.nix diff --git a/home/nvim/fugitive.lua b/modules/nvim/fugitive.lua similarity index 100% rename from home/nvim/fugitive.lua rename to modules/nvim/fugitive.lua diff --git a/home/nvim/keybinds.lua b/modules/nvim/keybinds.lua similarity index 100% rename from home/nvim/keybinds.lua rename to modules/nvim/keybinds.lua diff --git a/home/nvim/lspconfig.lua b/modules/nvim/lspconfig.lua similarity index 100% rename from home/nvim/lspconfig.lua rename to modules/nvim/lspconfig.lua diff --git a/home/nvim/telescope.lua b/modules/nvim/telescope.lua similarity index 100% rename from home/nvim/telescope.lua rename to modules/nvim/telescope.lua diff --git a/home/nvim/treesitter.lua b/modules/nvim/treesitter.lua similarity index 100% rename from home/nvim/treesitter.lua rename to modules/nvim/treesitter.lua diff --git a/home/nvim/undotree.lua b/modules/nvim/undotree.lua similarity index 100% rename from home/nvim/undotree.lua rename to modules/nvim/undotree.lua diff --git a/home/packages.nix b/modules/packages.nix similarity index 94% rename from home/packages.nix rename to modules/packages.nix index 6e7d173..7bb3a3e 100644 --- a/home/packages.nix +++ b/modules/packages.nix @@ -40,7 +40,6 @@ osu-lazer # Misc - nerdfonts # Font with glyphs for status bar comma # Run any binary from the repos with a comma `, cowsay neato` gnome-decoder tor-browser-bundle-bin diff --git a/home/thunderbird.nix b/modules/thunderbird.nix similarity index 100% rename from home/thunderbird.nix rename to modules/thunderbird.nix diff --git a/home/vscode.nix b/modules/vscode.nix similarity index 95% rename from home/vscode.nix rename to modules/vscode.nix index fc4d65c..413f943 100644 --- a/home/vscode.nix +++ b/modules/vscode.nix @@ -62,6 +62,9 @@ }; }; "terminal.integrated.defaultProfile.linux" = "bash"; + + "editor.fontFamily" = "'FiraCode Nerd Font'"; + "editor.fontLigatures" = true; }; }; }