From 12707eae34ffe58bf91ed629dc35b8234d5e09e8 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sat, 16 Nov 2024 04:56:36 +0300 Subject: [PATCH] Home: Refactor a bit. --- config/Package.nix | 2 +- home/Android.nix | 8 ++++-- home/NixOs.nix | 8 ++++-- home/env/Variable.nix | 14 ++++++++++ home/env/default.nix | 6 ++++ home/{config => file}/btop/default.nix | 0 home/{config => file}/chromium/default.nix | 0 home/{config => file}/dconf/Accessibility.nix | 0 home/{config => file}/dconf/Gtk.nix | 0 home/{config => file}/dconf/Input.nix | 0 home/{config => file}/dconf/Interface.nix | 0 home/{config => file}/dconf/Key.nix | 0 home/{config => file}/dconf/Media.nix | 0 home/{config => file}/dconf/Nautilus.nix | 0 home/{config => file}/dconf/Power.nix | 0 home/{config => file}/dconf/Privacy.nix | 0 home/{config => file}/dconf/Session.nix | 0 home/{config => file}/dconf/Shell.nix | 0 home/{config => file}/dconf/Software.nix | 0 home/{config => file}/dconf/Sound.nix | 0 home/{config => file}/dconf/Wm.nix | 0 home/{config => file}/default.nix | 0 .../{config => file}/editorconfig/default.nix | 0 home/{config => file}/foot/default.nix | 0 home/{config => file}/fuzzel/default.nix | 0 home/{config => file}/git/default.nix | 0 home/{config => file}/jetbrains/default.nix | 0 home/{config => file}/keyd/default.nix | 0 .../{config => file}/keyd/module/Chromium.nix | 0 home/{config => file}/keyd/module/DRG.nix | 0 home/{config => file}/keyd/module/Disable.nix | 0 home/{config => file}/keyd/module/Firefox.nix | 0 .../keyd/module/Jetbrains.nix | 0 .../{config => file}/keyd/module/Nautilus.nix | 0 home/{config => file}/mako/default.nix | 0 home/{config => file}/mangohud/default.nix | 0 home/{config => file}/nvim/default.nix | 0 .../nvim/module/config/Autoread.nix | 0 .../nvim/module/config/Etc.nix | 0 .../nvim/module/config/Highlight.nix | 0 .../nvim/module/config/Search.nix | 0 .../nvim/module/config/Tab.nix | 0 .../nvim/module/key/Autocomplete.nix | 0 .../nvim/module/key/Buffer.nix | 0 home/{config => file}/nvim/module/key/Cmd.nix | 0 .../nvim/module/key/Colorscheme.nix | 0 .../nvim/module/key/Filetree.nix | 0 .../nvim/module/key/Gitsigns.nix | 0 .../nvim/module/key/Leader.nix | 0 .../nvim/module/key/Navigation.nix | 0 .../nvim/module/key/Prompt.nix | 0 .../nvim/module/key/Rekey.nix | 0 .../{config => file}/nvim/module/key/Save.nix | 0 .../{config => file}/nvim/module/key/Sort.nix | 0 .../nvim/module/key/TabWidth.nix | 0 .../nvim/module/key/Telescope.nix | 0 .../nvim/module/key/Terminal.nix | 0 .../nvim/module/key/Trouble.nix | 0 .../nvim/module/plugin/Align.nix | 0 .../nvim/module/plugin/Autoclose.nix | 0 .../nvim/module/plugin/Bufferline.nix | 0 .../nvim/module/plugin/Closebuffers.nix | 0 .../nvim/module/plugin/Colorizer.nix | 0 .../nvim/module/plugin/Dressing.nix | 0 .../nvim/module/plugin/Filetree.nix | 0 .../nvim/module/plugin/Fold.nix | 0 .../nvim/module/plugin/Gen.nix | 0 .../nvim/module/plugin/Gitsigns.nix | 0 .../nvim/module/plugin/Gruvbox.nix | 0 .../nvim/module/plugin/Indent.nix | 0 .../nvim/module/plugin/Init.nix | 0 .../nvim/module/plugin/Telescope.nix | 0 .../nvim/module/plugin/Todo.nix | 0 .../nvim/module/plugin/Treesitter.nix | 0 .../nvim/module/plugin/Trouble.nix | 0 .../nvim/module/plugin/lsp/Go.nix | 0 .../nvim/module/plugin/lsp/Haskell.nix | 0 .../nvim/module/plugin/lsp/Kotlin.nix | 0 .../nvim/module/plugin/lsp/Lua.nix | 0 .../nvim/module/plugin/lsp/Nix.nix | 0 .../nvim/module/plugin/lsp/Python.nix | 0 .../nvim/module/plugin/lsp/Rust.nix | 0 .../nvim/module/plugin/lsp/Tex.nix | 0 home/{config => file}/ssh/default.nix | 0 home/{config => file}/swappy/default.nix | 0 home/{config => file}/sway/default.nix | 0 home/{config => file}/sway/module/Display.nix | 0 home/{config => file}/sway/module/Font.nix | 0 home/{config => file}/sway/module/Input.nix | 0 home/{config => file}/sway/module/Keyd.nix | 0 .../{config => file}/sway/module/Launcher.nix | 0 home/{config => file}/sway/module/Mod.nix | 0 home/{config => file}/sway/module/Mouse.nix | 0 .../sway/module/Navigation.nix | 0 .../sway/module/Notification.nix | 0 home/{config => file}/sway/module/Resize.nix | 0 .../sway/module/ScratchPad.nix | 0 .../sway/module/Screenshot.nix | 0 home/{config => file}/sway/module/Session.nix | 0 home/{config => file}/sway/module/Sound.nix | 0 home/{config => file}/sway/module/Style.nix | 0 home/{config => file}/sway/module/System.nix | 0 .../{config => file}/sway/module/Terminal.nix | 0 home/{config => file}/sway/module/Tiling.nix | 0 .../{config => file}/sway/module/TitleBar.nix | 0 home/{config => file}/sway/module/Waybar.nix | 0 .../sway/module/Workspace.nix | 0 home/{config => file}/template/Android.nix | 0 home/{config => file}/template/DevShell.nix | 0 home/{config => file}/template/FHSEnv.nix | 0 home/{config => file}/template/Latex.nix | 0 home/{config => file}/template/Rust.nix | 0 home/{config => file}/tmux/default.nix | 0 home/{config => file}/tmux/module/Config.nix | 0 home/{config => file}/tmux/module/Copy.nix | 0 home/{config => file}/tmux/module/Env.nix | 0 home/{config => file}/tmux/module/Scroll.nix | 0 home/{config => file}/tmux/module/Session.nix | 0 home/{config => file}/tmux/module/Split.nix | 0 home/{config => file}/tmux/module/Status.nix | 0 home/{config => file}/tmux/module/Window.nix | 0 .../waybar/config/default.nix | 0 home/{config => file}/waybar/default.nix | 0 home/{config => file}/waybar/style/Common.nix | 0 home/{config => file}/waybar/style/Plugin.nix | 0 home/{config => file}/waybar/style/Window.nix | 0 home/{config => file}/yazi/default.nix | 0 home/{config => file}/yazi/module/Init.nix | 0 home/{config => file}/yazi/module/Keymap.nix | 0 home/{config => file}/yazi/module/Theme.nix | 0 home/{config => file}/yazi/module/Yazi.nix | 0 home/variable/default.nix | 28 ------------------- 132 files changed, 31 insertions(+), 35 deletions(-) create mode 100644 home/env/Variable.nix create mode 100644 home/env/default.nix rename home/{config => file}/btop/default.nix (100%) rename home/{config => file}/chromium/default.nix (100%) rename home/{config => file}/dconf/Accessibility.nix (100%) rename home/{config => file}/dconf/Gtk.nix (100%) rename home/{config => file}/dconf/Input.nix (100%) rename home/{config => file}/dconf/Interface.nix (100%) rename home/{config => file}/dconf/Key.nix (100%) rename home/{config => file}/dconf/Media.nix (100%) rename home/{config => file}/dconf/Nautilus.nix (100%) rename home/{config => file}/dconf/Power.nix (100%) rename home/{config => file}/dconf/Privacy.nix (100%) rename home/{config => file}/dconf/Session.nix (100%) rename home/{config => file}/dconf/Shell.nix (100%) rename home/{config => file}/dconf/Software.nix (100%) rename home/{config => file}/dconf/Sound.nix (100%) rename home/{config => file}/dconf/Wm.nix (100%) rename home/{config => file}/default.nix (100%) rename home/{config => file}/editorconfig/default.nix (100%) rename home/{config => file}/foot/default.nix (100%) rename home/{config => file}/fuzzel/default.nix (100%) rename home/{config => file}/git/default.nix (100%) rename home/{config => file}/jetbrains/default.nix (100%) rename home/{config => file}/keyd/default.nix (100%) rename home/{config => file}/keyd/module/Chromium.nix (100%) rename home/{config => file}/keyd/module/DRG.nix (100%) rename home/{config => file}/keyd/module/Disable.nix (100%) rename home/{config => file}/keyd/module/Firefox.nix (100%) rename home/{config => file}/keyd/module/Jetbrains.nix (100%) rename home/{config => file}/keyd/module/Nautilus.nix (100%) rename home/{config => file}/mako/default.nix (100%) rename home/{config => file}/mangohud/default.nix (100%) rename home/{config => file}/nvim/default.nix (100%) rename home/{config => file}/nvim/module/config/Autoread.nix (100%) rename home/{config => file}/nvim/module/config/Etc.nix (100%) rename home/{config => file}/nvim/module/config/Highlight.nix (100%) rename home/{config => file}/nvim/module/config/Search.nix (100%) rename home/{config => file}/nvim/module/config/Tab.nix (100%) rename home/{config => file}/nvim/module/key/Autocomplete.nix (100%) rename home/{config => file}/nvim/module/key/Buffer.nix (100%) rename home/{config => file}/nvim/module/key/Cmd.nix (100%) rename home/{config => file}/nvim/module/key/Colorscheme.nix (100%) rename home/{config => file}/nvim/module/key/Filetree.nix (100%) rename home/{config => file}/nvim/module/key/Gitsigns.nix (100%) rename home/{config => file}/nvim/module/key/Leader.nix (100%) rename home/{config => file}/nvim/module/key/Navigation.nix (100%) rename home/{config => file}/nvim/module/key/Prompt.nix (100%) rename home/{config => file}/nvim/module/key/Rekey.nix (100%) rename home/{config => file}/nvim/module/key/Save.nix (100%) rename home/{config => file}/nvim/module/key/Sort.nix (100%) rename home/{config => file}/nvim/module/key/TabWidth.nix (100%) rename home/{config => file}/nvim/module/key/Telescope.nix (100%) rename home/{config => file}/nvim/module/key/Terminal.nix (100%) rename home/{config => file}/nvim/module/key/Trouble.nix (100%) rename home/{config => file}/nvim/module/plugin/Align.nix (100%) rename home/{config => file}/nvim/module/plugin/Autoclose.nix (100%) rename home/{config => file}/nvim/module/plugin/Bufferline.nix (100%) rename home/{config => file}/nvim/module/plugin/Closebuffers.nix (100%) rename home/{config => file}/nvim/module/plugin/Colorizer.nix (100%) rename home/{config => file}/nvim/module/plugin/Dressing.nix (100%) rename home/{config => file}/nvim/module/plugin/Filetree.nix (100%) rename home/{config => file}/nvim/module/plugin/Fold.nix (100%) rename home/{config => file}/nvim/module/plugin/Gen.nix (100%) rename home/{config => file}/nvim/module/plugin/Gitsigns.nix (100%) rename home/{config => file}/nvim/module/plugin/Gruvbox.nix (100%) rename home/{config => file}/nvim/module/plugin/Indent.nix (100%) rename home/{config => file}/nvim/module/plugin/Init.nix (100%) rename home/{config => file}/nvim/module/plugin/Telescope.nix (100%) rename home/{config => file}/nvim/module/plugin/Todo.nix (100%) rename home/{config => file}/nvim/module/plugin/Treesitter.nix (100%) rename home/{config => file}/nvim/module/plugin/Trouble.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Go.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Haskell.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Kotlin.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Lua.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Nix.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Python.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Rust.nix (100%) rename home/{config => file}/nvim/module/plugin/lsp/Tex.nix (100%) rename home/{config => file}/ssh/default.nix (100%) rename home/{config => file}/swappy/default.nix (100%) rename home/{config => file}/sway/default.nix (100%) rename home/{config => file}/sway/module/Display.nix (100%) rename home/{config => file}/sway/module/Font.nix (100%) rename home/{config => file}/sway/module/Input.nix (100%) rename home/{config => file}/sway/module/Keyd.nix (100%) rename home/{config => file}/sway/module/Launcher.nix (100%) rename home/{config => file}/sway/module/Mod.nix (100%) rename home/{config => file}/sway/module/Mouse.nix (100%) rename home/{config => file}/sway/module/Navigation.nix (100%) rename home/{config => file}/sway/module/Notification.nix (100%) rename home/{config => file}/sway/module/Resize.nix (100%) rename home/{config => file}/sway/module/ScratchPad.nix (100%) rename home/{config => file}/sway/module/Screenshot.nix (100%) rename home/{config => file}/sway/module/Session.nix (100%) rename home/{config => file}/sway/module/Sound.nix (100%) rename home/{config => file}/sway/module/Style.nix (100%) rename home/{config => file}/sway/module/System.nix (100%) rename home/{config => file}/sway/module/Terminal.nix (100%) rename home/{config => file}/sway/module/Tiling.nix (100%) rename home/{config => file}/sway/module/TitleBar.nix (100%) rename home/{config => file}/sway/module/Waybar.nix (100%) rename home/{config => file}/sway/module/Workspace.nix (100%) rename home/{config => file}/template/Android.nix (100%) rename home/{config => file}/template/DevShell.nix (100%) rename home/{config => file}/template/FHSEnv.nix (100%) rename home/{config => file}/template/Latex.nix (100%) rename home/{config => file}/template/Rust.nix (100%) rename home/{config => file}/tmux/default.nix (100%) rename home/{config => file}/tmux/module/Config.nix (100%) rename home/{config => file}/tmux/module/Copy.nix (100%) rename home/{config => file}/tmux/module/Env.nix (100%) rename home/{config => file}/tmux/module/Scroll.nix (100%) rename home/{config => file}/tmux/module/Session.nix (100%) rename home/{config => file}/tmux/module/Split.nix (100%) rename home/{config => file}/tmux/module/Status.nix (100%) rename home/{config => file}/tmux/module/Window.nix (100%) rename home/{config => file}/waybar/config/default.nix (100%) rename home/{config => file}/waybar/default.nix (100%) rename home/{config => file}/waybar/style/Common.nix (100%) rename home/{config => file}/waybar/style/Plugin.nix (100%) rename home/{config => file}/waybar/style/Window.nix (100%) rename home/{config => file}/yazi/default.nix (100%) rename home/{config => file}/yazi/module/Init.nix (100%) rename home/{config => file}/yazi/module/Keymap.nix (100%) rename home/{config => file}/yazi/module/Theme.nix (100%) rename home/{config => file}/yazi/module/Yazi.nix (100%) delete mode 100644 home/variable/default.nix diff --git a/config/Package.nix b/config/Package.nix index 0e5efd10..bf89a387 100644 --- a/config/Package.nix +++ b/config/Package.nix @@ -45,7 +45,7 @@ in { # Chromium config. environment.etc = let - chromium = import args; + chromium = import args; in { "chromium/initial_preferences".source = lib.mkForce chromium.preferences; "chromium/policies/managed/extra.json".source = lib.mkForce chromium.policy; diff --git a/home/Android.nix b/home/Android.nix index 24a6f1b4..c1493430 100644 --- a/home/Android.nix +++ b/home/Android.nix @@ -13,6 +13,8 @@ } @args: let cfg = config.home.android; android = import ./android args; + env = import ./env args; + file = import ./file args; package = import args; programs = import ./program args; stylix = import args; @@ -35,9 +37,9 @@ in { inputs.stylix.homeManagerModules.stylix ]; home = { - file = import ./config args; - sessionVariables = import ./variable args; - stateVersion = const.droidStateVersion; + inherit (env) sessionVariables; + inherit file; + stateVersion = const.droidStateVersion; }; }; }; diff --git a/home/NixOs.nix b/home/NixOs.nix index f963f3c8..1f3de578 100644 --- a/home/NixOs.nix +++ b/home/NixOs.nix @@ -9,6 +9,8 @@ ... } @args: let cfg = config.home.nixos; + env = import ./env args; + file = import ./file args; programs = import ./program args; in { imports = (util.ls ); @@ -29,16 +31,16 @@ in { ${user.username} = { home = { inherit (const) stateVersion; + inherit (env) sessionVariables; inherit (user) username homeDirectory; - file = import ./config args; - sessionVariables = import ./variable args; + inherit file; # ISSUE: https://github.com/nix-community/home-manager/issues/5589 extraActivationPath = with pkgs; [ openssh ]; }; xdg = import ./xdg { inherit (user) homeDirectory; }; programs = with programs; core // desktop; - dconf.settings = util.catSet (util.ls ./config/dconf) args; + dconf.settings = util.catSet (util.ls ./file/dconf) args; }; } ) { } cfg.users; diff --git a/home/env/Variable.nix b/home/env/Variable.nix new file mode 100644 index 00000000..43f1bb44 --- /dev/null +++ b/home/env/Variable.nix @@ -0,0 +1,14 @@ +{ + pkgs, + ... +}: { + EDITOR = "nvim"; # Default text editor. + GTK_CSD = 0; # GTK apps compat. + MANGOHUD = "1"; # Enable Mangohud by default. + MANPAGER = "nvim +Man!"; # App to use for man pages. + MOZ_LEGACY_PROFILES = "1"; # Disable Firefox profile switching on rebuild. + NIXPKGS_ALLOW_UNFREE = "1"; # Allow unfree packages in shell. + NIX_CURRENT_SYSTEM = "${pkgs.stdenv.system}"; # Current system architecture. + TERM = "xterm-256color"; # Terminal settings. + WINEFSYNC = "1"; # Use fsync for Wine. +} diff --git a/home/env/default.nix b/home/env/default.nix new file mode 100644 index 00000000..9ecbc3e9 --- /dev/null +++ b/home/env/default.nix @@ -0,0 +1,6 @@ +{ + pkgs, + ... +} @args: { + sessionVariables = import ./Variable.nix args; +} diff --git a/home/config/btop/default.nix b/home/file/btop/default.nix similarity index 100% rename from home/config/btop/default.nix rename to home/file/btop/default.nix diff --git a/home/config/chromium/default.nix b/home/file/chromium/default.nix similarity index 100% rename from home/config/chromium/default.nix rename to home/file/chromium/default.nix diff --git a/home/config/dconf/Accessibility.nix b/home/file/dconf/Accessibility.nix similarity index 100% rename from home/config/dconf/Accessibility.nix rename to home/file/dconf/Accessibility.nix diff --git a/home/config/dconf/Gtk.nix b/home/file/dconf/Gtk.nix similarity index 100% rename from home/config/dconf/Gtk.nix rename to home/file/dconf/Gtk.nix diff --git a/home/config/dconf/Input.nix b/home/file/dconf/Input.nix similarity index 100% rename from home/config/dconf/Input.nix rename to home/file/dconf/Input.nix diff --git a/home/config/dconf/Interface.nix b/home/file/dconf/Interface.nix similarity index 100% rename from home/config/dconf/Interface.nix rename to home/file/dconf/Interface.nix diff --git a/home/config/dconf/Key.nix b/home/file/dconf/Key.nix similarity index 100% rename from home/config/dconf/Key.nix rename to home/file/dconf/Key.nix diff --git a/home/config/dconf/Media.nix b/home/file/dconf/Media.nix similarity index 100% rename from home/config/dconf/Media.nix rename to home/file/dconf/Media.nix diff --git a/home/config/dconf/Nautilus.nix b/home/file/dconf/Nautilus.nix similarity index 100% rename from home/config/dconf/Nautilus.nix rename to home/file/dconf/Nautilus.nix diff --git a/home/config/dconf/Power.nix b/home/file/dconf/Power.nix similarity index 100% rename from home/config/dconf/Power.nix rename to home/file/dconf/Power.nix diff --git a/home/config/dconf/Privacy.nix b/home/file/dconf/Privacy.nix similarity index 100% rename from home/config/dconf/Privacy.nix rename to home/file/dconf/Privacy.nix diff --git a/home/config/dconf/Session.nix b/home/file/dconf/Session.nix similarity index 100% rename from home/config/dconf/Session.nix rename to home/file/dconf/Session.nix diff --git a/home/config/dconf/Shell.nix b/home/file/dconf/Shell.nix similarity index 100% rename from home/config/dconf/Shell.nix rename to home/file/dconf/Shell.nix diff --git a/home/config/dconf/Software.nix b/home/file/dconf/Software.nix similarity index 100% rename from home/config/dconf/Software.nix rename to home/file/dconf/Software.nix diff --git a/home/config/dconf/Sound.nix b/home/file/dconf/Sound.nix similarity index 100% rename from home/config/dconf/Sound.nix rename to home/file/dconf/Sound.nix diff --git a/home/config/dconf/Wm.nix b/home/file/dconf/Wm.nix similarity index 100% rename from home/config/dconf/Wm.nix rename to home/file/dconf/Wm.nix diff --git a/home/config/default.nix b/home/file/default.nix similarity index 100% rename from home/config/default.nix rename to home/file/default.nix diff --git a/home/config/editorconfig/default.nix b/home/file/editorconfig/default.nix similarity index 100% rename from home/config/editorconfig/default.nix rename to home/file/editorconfig/default.nix diff --git a/home/config/foot/default.nix b/home/file/foot/default.nix similarity index 100% rename from home/config/foot/default.nix rename to home/file/foot/default.nix diff --git a/home/config/fuzzel/default.nix b/home/file/fuzzel/default.nix similarity index 100% rename from home/config/fuzzel/default.nix rename to home/file/fuzzel/default.nix diff --git a/home/config/git/default.nix b/home/file/git/default.nix similarity index 100% rename from home/config/git/default.nix rename to home/file/git/default.nix diff --git a/home/config/jetbrains/default.nix b/home/file/jetbrains/default.nix similarity index 100% rename from home/config/jetbrains/default.nix rename to home/file/jetbrains/default.nix diff --git a/home/config/keyd/default.nix b/home/file/keyd/default.nix similarity index 100% rename from home/config/keyd/default.nix rename to home/file/keyd/default.nix diff --git a/home/config/keyd/module/Chromium.nix b/home/file/keyd/module/Chromium.nix similarity index 100% rename from home/config/keyd/module/Chromium.nix rename to home/file/keyd/module/Chromium.nix diff --git a/home/config/keyd/module/DRG.nix b/home/file/keyd/module/DRG.nix similarity index 100% rename from home/config/keyd/module/DRG.nix rename to home/file/keyd/module/DRG.nix diff --git a/home/config/keyd/module/Disable.nix b/home/file/keyd/module/Disable.nix similarity index 100% rename from home/config/keyd/module/Disable.nix rename to home/file/keyd/module/Disable.nix diff --git a/home/config/keyd/module/Firefox.nix b/home/file/keyd/module/Firefox.nix similarity index 100% rename from home/config/keyd/module/Firefox.nix rename to home/file/keyd/module/Firefox.nix diff --git a/home/config/keyd/module/Jetbrains.nix b/home/file/keyd/module/Jetbrains.nix similarity index 100% rename from home/config/keyd/module/Jetbrains.nix rename to home/file/keyd/module/Jetbrains.nix diff --git a/home/config/keyd/module/Nautilus.nix b/home/file/keyd/module/Nautilus.nix similarity index 100% rename from home/config/keyd/module/Nautilus.nix rename to home/file/keyd/module/Nautilus.nix diff --git a/home/config/mako/default.nix b/home/file/mako/default.nix similarity index 100% rename from home/config/mako/default.nix rename to home/file/mako/default.nix diff --git a/home/config/mangohud/default.nix b/home/file/mangohud/default.nix similarity index 100% rename from home/config/mangohud/default.nix rename to home/file/mangohud/default.nix diff --git a/home/config/nvim/default.nix b/home/file/nvim/default.nix similarity index 100% rename from home/config/nvim/default.nix rename to home/file/nvim/default.nix diff --git a/home/config/nvim/module/config/Autoread.nix b/home/file/nvim/module/config/Autoread.nix similarity index 100% rename from home/config/nvim/module/config/Autoread.nix rename to home/file/nvim/module/config/Autoread.nix diff --git a/home/config/nvim/module/config/Etc.nix b/home/file/nvim/module/config/Etc.nix similarity index 100% rename from home/config/nvim/module/config/Etc.nix rename to home/file/nvim/module/config/Etc.nix diff --git a/home/config/nvim/module/config/Highlight.nix b/home/file/nvim/module/config/Highlight.nix similarity index 100% rename from home/config/nvim/module/config/Highlight.nix rename to home/file/nvim/module/config/Highlight.nix diff --git a/home/config/nvim/module/config/Search.nix b/home/file/nvim/module/config/Search.nix similarity index 100% rename from home/config/nvim/module/config/Search.nix rename to home/file/nvim/module/config/Search.nix diff --git a/home/config/nvim/module/config/Tab.nix b/home/file/nvim/module/config/Tab.nix similarity index 100% rename from home/config/nvim/module/config/Tab.nix rename to home/file/nvim/module/config/Tab.nix diff --git a/home/config/nvim/module/key/Autocomplete.nix b/home/file/nvim/module/key/Autocomplete.nix similarity index 100% rename from home/config/nvim/module/key/Autocomplete.nix rename to home/file/nvim/module/key/Autocomplete.nix diff --git a/home/config/nvim/module/key/Buffer.nix b/home/file/nvim/module/key/Buffer.nix similarity index 100% rename from home/config/nvim/module/key/Buffer.nix rename to home/file/nvim/module/key/Buffer.nix diff --git a/home/config/nvim/module/key/Cmd.nix b/home/file/nvim/module/key/Cmd.nix similarity index 100% rename from home/config/nvim/module/key/Cmd.nix rename to home/file/nvim/module/key/Cmd.nix diff --git a/home/config/nvim/module/key/Colorscheme.nix b/home/file/nvim/module/key/Colorscheme.nix similarity index 100% rename from home/config/nvim/module/key/Colorscheme.nix rename to home/file/nvim/module/key/Colorscheme.nix diff --git a/home/config/nvim/module/key/Filetree.nix b/home/file/nvim/module/key/Filetree.nix similarity index 100% rename from home/config/nvim/module/key/Filetree.nix rename to home/file/nvim/module/key/Filetree.nix diff --git a/home/config/nvim/module/key/Gitsigns.nix b/home/file/nvim/module/key/Gitsigns.nix similarity index 100% rename from home/config/nvim/module/key/Gitsigns.nix rename to home/file/nvim/module/key/Gitsigns.nix diff --git a/home/config/nvim/module/key/Leader.nix b/home/file/nvim/module/key/Leader.nix similarity index 100% rename from home/config/nvim/module/key/Leader.nix rename to home/file/nvim/module/key/Leader.nix diff --git a/home/config/nvim/module/key/Navigation.nix b/home/file/nvim/module/key/Navigation.nix similarity index 100% rename from home/config/nvim/module/key/Navigation.nix rename to home/file/nvim/module/key/Navigation.nix diff --git a/home/config/nvim/module/key/Prompt.nix b/home/file/nvim/module/key/Prompt.nix similarity index 100% rename from home/config/nvim/module/key/Prompt.nix rename to home/file/nvim/module/key/Prompt.nix diff --git a/home/config/nvim/module/key/Rekey.nix b/home/file/nvim/module/key/Rekey.nix similarity index 100% rename from home/config/nvim/module/key/Rekey.nix rename to home/file/nvim/module/key/Rekey.nix diff --git a/home/config/nvim/module/key/Save.nix b/home/file/nvim/module/key/Save.nix similarity index 100% rename from home/config/nvim/module/key/Save.nix rename to home/file/nvim/module/key/Save.nix diff --git a/home/config/nvim/module/key/Sort.nix b/home/file/nvim/module/key/Sort.nix similarity index 100% rename from home/config/nvim/module/key/Sort.nix rename to home/file/nvim/module/key/Sort.nix diff --git a/home/config/nvim/module/key/TabWidth.nix b/home/file/nvim/module/key/TabWidth.nix similarity index 100% rename from home/config/nvim/module/key/TabWidth.nix rename to home/file/nvim/module/key/TabWidth.nix diff --git a/home/config/nvim/module/key/Telescope.nix b/home/file/nvim/module/key/Telescope.nix similarity index 100% rename from home/config/nvim/module/key/Telescope.nix rename to home/file/nvim/module/key/Telescope.nix diff --git a/home/config/nvim/module/key/Terminal.nix b/home/file/nvim/module/key/Terminal.nix similarity index 100% rename from home/config/nvim/module/key/Terminal.nix rename to home/file/nvim/module/key/Terminal.nix diff --git a/home/config/nvim/module/key/Trouble.nix b/home/file/nvim/module/key/Trouble.nix similarity index 100% rename from home/config/nvim/module/key/Trouble.nix rename to home/file/nvim/module/key/Trouble.nix diff --git a/home/config/nvim/module/plugin/Align.nix b/home/file/nvim/module/plugin/Align.nix similarity index 100% rename from home/config/nvim/module/plugin/Align.nix rename to home/file/nvim/module/plugin/Align.nix diff --git a/home/config/nvim/module/plugin/Autoclose.nix b/home/file/nvim/module/plugin/Autoclose.nix similarity index 100% rename from home/config/nvim/module/plugin/Autoclose.nix rename to home/file/nvim/module/plugin/Autoclose.nix diff --git a/home/config/nvim/module/plugin/Bufferline.nix b/home/file/nvim/module/plugin/Bufferline.nix similarity index 100% rename from home/config/nvim/module/plugin/Bufferline.nix rename to home/file/nvim/module/plugin/Bufferline.nix diff --git a/home/config/nvim/module/plugin/Closebuffers.nix b/home/file/nvim/module/plugin/Closebuffers.nix similarity index 100% rename from home/config/nvim/module/plugin/Closebuffers.nix rename to home/file/nvim/module/plugin/Closebuffers.nix diff --git a/home/config/nvim/module/plugin/Colorizer.nix b/home/file/nvim/module/plugin/Colorizer.nix similarity index 100% rename from home/config/nvim/module/plugin/Colorizer.nix rename to home/file/nvim/module/plugin/Colorizer.nix diff --git a/home/config/nvim/module/plugin/Dressing.nix b/home/file/nvim/module/plugin/Dressing.nix similarity index 100% rename from home/config/nvim/module/plugin/Dressing.nix rename to home/file/nvim/module/plugin/Dressing.nix diff --git a/home/config/nvim/module/plugin/Filetree.nix b/home/file/nvim/module/plugin/Filetree.nix similarity index 100% rename from home/config/nvim/module/plugin/Filetree.nix rename to home/file/nvim/module/plugin/Filetree.nix diff --git a/home/config/nvim/module/plugin/Fold.nix b/home/file/nvim/module/plugin/Fold.nix similarity index 100% rename from home/config/nvim/module/plugin/Fold.nix rename to home/file/nvim/module/plugin/Fold.nix diff --git a/home/config/nvim/module/plugin/Gen.nix b/home/file/nvim/module/plugin/Gen.nix similarity index 100% rename from home/config/nvim/module/plugin/Gen.nix rename to home/file/nvim/module/plugin/Gen.nix diff --git a/home/config/nvim/module/plugin/Gitsigns.nix b/home/file/nvim/module/plugin/Gitsigns.nix similarity index 100% rename from home/config/nvim/module/plugin/Gitsigns.nix rename to home/file/nvim/module/plugin/Gitsigns.nix diff --git a/home/config/nvim/module/plugin/Gruvbox.nix b/home/file/nvim/module/plugin/Gruvbox.nix similarity index 100% rename from home/config/nvim/module/plugin/Gruvbox.nix rename to home/file/nvim/module/plugin/Gruvbox.nix diff --git a/home/config/nvim/module/plugin/Indent.nix b/home/file/nvim/module/plugin/Indent.nix similarity index 100% rename from home/config/nvim/module/plugin/Indent.nix rename to home/file/nvim/module/plugin/Indent.nix diff --git a/home/config/nvim/module/plugin/Init.nix b/home/file/nvim/module/plugin/Init.nix similarity index 100% rename from home/config/nvim/module/plugin/Init.nix rename to home/file/nvim/module/plugin/Init.nix diff --git a/home/config/nvim/module/plugin/Telescope.nix b/home/file/nvim/module/plugin/Telescope.nix similarity index 100% rename from home/config/nvim/module/plugin/Telescope.nix rename to home/file/nvim/module/plugin/Telescope.nix diff --git a/home/config/nvim/module/plugin/Todo.nix b/home/file/nvim/module/plugin/Todo.nix similarity index 100% rename from home/config/nvim/module/plugin/Todo.nix rename to home/file/nvim/module/plugin/Todo.nix diff --git a/home/config/nvim/module/plugin/Treesitter.nix b/home/file/nvim/module/plugin/Treesitter.nix similarity index 100% rename from home/config/nvim/module/plugin/Treesitter.nix rename to home/file/nvim/module/plugin/Treesitter.nix diff --git a/home/config/nvim/module/plugin/Trouble.nix b/home/file/nvim/module/plugin/Trouble.nix similarity index 100% rename from home/config/nvim/module/plugin/Trouble.nix rename to home/file/nvim/module/plugin/Trouble.nix diff --git a/home/config/nvim/module/plugin/lsp/Go.nix b/home/file/nvim/module/plugin/lsp/Go.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Go.nix rename to home/file/nvim/module/plugin/lsp/Go.nix diff --git a/home/config/nvim/module/plugin/lsp/Haskell.nix b/home/file/nvim/module/plugin/lsp/Haskell.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Haskell.nix rename to home/file/nvim/module/plugin/lsp/Haskell.nix diff --git a/home/config/nvim/module/plugin/lsp/Kotlin.nix b/home/file/nvim/module/plugin/lsp/Kotlin.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Kotlin.nix rename to home/file/nvim/module/plugin/lsp/Kotlin.nix diff --git a/home/config/nvim/module/plugin/lsp/Lua.nix b/home/file/nvim/module/plugin/lsp/Lua.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Lua.nix rename to home/file/nvim/module/plugin/lsp/Lua.nix diff --git a/home/config/nvim/module/plugin/lsp/Nix.nix b/home/file/nvim/module/plugin/lsp/Nix.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Nix.nix rename to home/file/nvim/module/plugin/lsp/Nix.nix diff --git a/home/config/nvim/module/plugin/lsp/Python.nix b/home/file/nvim/module/plugin/lsp/Python.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Python.nix rename to home/file/nvim/module/plugin/lsp/Python.nix diff --git a/home/config/nvim/module/plugin/lsp/Rust.nix b/home/file/nvim/module/plugin/lsp/Rust.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Rust.nix rename to home/file/nvim/module/plugin/lsp/Rust.nix diff --git a/home/config/nvim/module/plugin/lsp/Tex.nix b/home/file/nvim/module/plugin/lsp/Tex.nix similarity index 100% rename from home/config/nvim/module/plugin/lsp/Tex.nix rename to home/file/nvim/module/plugin/lsp/Tex.nix diff --git a/home/config/ssh/default.nix b/home/file/ssh/default.nix similarity index 100% rename from home/config/ssh/default.nix rename to home/file/ssh/default.nix diff --git a/home/config/swappy/default.nix b/home/file/swappy/default.nix similarity index 100% rename from home/config/swappy/default.nix rename to home/file/swappy/default.nix diff --git a/home/config/sway/default.nix b/home/file/sway/default.nix similarity index 100% rename from home/config/sway/default.nix rename to home/file/sway/default.nix diff --git a/home/config/sway/module/Display.nix b/home/file/sway/module/Display.nix similarity index 100% rename from home/config/sway/module/Display.nix rename to home/file/sway/module/Display.nix diff --git a/home/config/sway/module/Font.nix b/home/file/sway/module/Font.nix similarity index 100% rename from home/config/sway/module/Font.nix rename to home/file/sway/module/Font.nix diff --git a/home/config/sway/module/Input.nix b/home/file/sway/module/Input.nix similarity index 100% rename from home/config/sway/module/Input.nix rename to home/file/sway/module/Input.nix diff --git a/home/config/sway/module/Keyd.nix b/home/file/sway/module/Keyd.nix similarity index 100% rename from home/config/sway/module/Keyd.nix rename to home/file/sway/module/Keyd.nix diff --git a/home/config/sway/module/Launcher.nix b/home/file/sway/module/Launcher.nix similarity index 100% rename from home/config/sway/module/Launcher.nix rename to home/file/sway/module/Launcher.nix diff --git a/home/config/sway/module/Mod.nix b/home/file/sway/module/Mod.nix similarity index 100% rename from home/config/sway/module/Mod.nix rename to home/file/sway/module/Mod.nix diff --git a/home/config/sway/module/Mouse.nix b/home/file/sway/module/Mouse.nix similarity index 100% rename from home/config/sway/module/Mouse.nix rename to home/file/sway/module/Mouse.nix diff --git a/home/config/sway/module/Navigation.nix b/home/file/sway/module/Navigation.nix similarity index 100% rename from home/config/sway/module/Navigation.nix rename to home/file/sway/module/Navigation.nix diff --git a/home/config/sway/module/Notification.nix b/home/file/sway/module/Notification.nix similarity index 100% rename from home/config/sway/module/Notification.nix rename to home/file/sway/module/Notification.nix diff --git a/home/config/sway/module/Resize.nix b/home/file/sway/module/Resize.nix similarity index 100% rename from home/config/sway/module/Resize.nix rename to home/file/sway/module/Resize.nix diff --git a/home/config/sway/module/ScratchPad.nix b/home/file/sway/module/ScratchPad.nix similarity index 100% rename from home/config/sway/module/ScratchPad.nix rename to home/file/sway/module/ScratchPad.nix diff --git a/home/config/sway/module/Screenshot.nix b/home/file/sway/module/Screenshot.nix similarity index 100% rename from home/config/sway/module/Screenshot.nix rename to home/file/sway/module/Screenshot.nix diff --git a/home/config/sway/module/Session.nix b/home/file/sway/module/Session.nix similarity index 100% rename from home/config/sway/module/Session.nix rename to home/file/sway/module/Session.nix diff --git a/home/config/sway/module/Sound.nix b/home/file/sway/module/Sound.nix similarity index 100% rename from home/config/sway/module/Sound.nix rename to home/file/sway/module/Sound.nix diff --git a/home/config/sway/module/Style.nix b/home/file/sway/module/Style.nix similarity index 100% rename from home/config/sway/module/Style.nix rename to home/file/sway/module/Style.nix diff --git a/home/config/sway/module/System.nix b/home/file/sway/module/System.nix similarity index 100% rename from home/config/sway/module/System.nix rename to home/file/sway/module/System.nix diff --git a/home/config/sway/module/Terminal.nix b/home/file/sway/module/Terminal.nix similarity index 100% rename from home/config/sway/module/Terminal.nix rename to home/file/sway/module/Terminal.nix diff --git a/home/config/sway/module/Tiling.nix b/home/file/sway/module/Tiling.nix similarity index 100% rename from home/config/sway/module/Tiling.nix rename to home/file/sway/module/Tiling.nix diff --git a/home/config/sway/module/TitleBar.nix b/home/file/sway/module/TitleBar.nix similarity index 100% rename from home/config/sway/module/TitleBar.nix rename to home/file/sway/module/TitleBar.nix diff --git a/home/config/sway/module/Waybar.nix b/home/file/sway/module/Waybar.nix similarity index 100% rename from home/config/sway/module/Waybar.nix rename to home/file/sway/module/Waybar.nix diff --git a/home/config/sway/module/Workspace.nix b/home/file/sway/module/Workspace.nix similarity index 100% rename from home/config/sway/module/Workspace.nix rename to home/file/sway/module/Workspace.nix diff --git a/home/config/template/Android.nix b/home/file/template/Android.nix similarity index 100% rename from home/config/template/Android.nix rename to home/file/template/Android.nix diff --git a/home/config/template/DevShell.nix b/home/file/template/DevShell.nix similarity index 100% rename from home/config/template/DevShell.nix rename to home/file/template/DevShell.nix diff --git a/home/config/template/FHSEnv.nix b/home/file/template/FHSEnv.nix similarity index 100% rename from home/config/template/FHSEnv.nix rename to home/file/template/FHSEnv.nix diff --git a/home/config/template/Latex.nix b/home/file/template/Latex.nix similarity index 100% rename from home/config/template/Latex.nix rename to home/file/template/Latex.nix diff --git a/home/config/template/Rust.nix b/home/file/template/Rust.nix similarity index 100% rename from home/config/template/Rust.nix rename to home/file/template/Rust.nix diff --git a/home/config/tmux/default.nix b/home/file/tmux/default.nix similarity index 100% rename from home/config/tmux/default.nix rename to home/file/tmux/default.nix diff --git a/home/config/tmux/module/Config.nix b/home/file/tmux/module/Config.nix similarity index 100% rename from home/config/tmux/module/Config.nix rename to home/file/tmux/module/Config.nix diff --git a/home/config/tmux/module/Copy.nix b/home/file/tmux/module/Copy.nix similarity index 100% rename from home/config/tmux/module/Copy.nix rename to home/file/tmux/module/Copy.nix diff --git a/home/config/tmux/module/Env.nix b/home/file/tmux/module/Env.nix similarity index 100% rename from home/config/tmux/module/Env.nix rename to home/file/tmux/module/Env.nix diff --git a/home/config/tmux/module/Scroll.nix b/home/file/tmux/module/Scroll.nix similarity index 100% rename from home/config/tmux/module/Scroll.nix rename to home/file/tmux/module/Scroll.nix diff --git a/home/config/tmux/module/Session.nix b/home/file/tmux/module/Session.nix similarity index 100% rename from home/config/tmux/module/Session.nix rename to home/file/tmux/module/Session.nix diff --git a/home/config/tmux/module/Split.nix b/home/file/tmux/module/Split.nix similarity index 100% rename from home/config/tmux/module/Split.nix rename to home/file/tmux/module/Split.nix diff --git a/home/config/tmux/module/Status.nix b/home/file/tmux/module/Status.nix similarity index 100% rename from home/config/tmux/module/Status.nix rename to home/file/tmux/module/Status.nix diff --git a/home/config/tmux/module/Window.nix b/home/file/tmux/module/Window.nix similarity index 100% rename from home/config/tmux/module/Window.nix rename to home/file/tmux/module/Window.nix diff --git a/home/config/waybar/config/default.nix b/home/file/waybar/config/default.nix similarity index 100% rename from home/config/waybar/config/default.nix rename to home/file/waybar/config/default.nix diff --git a/home/config/waybar/default.nix b/home/file/waybar/default.nix similarity index 100% rename from home/config/waybar/default.nix rename to home/file/waybar/default.nix diff --git a/home/config/waybar/style/Common.nix b/home/file/waybar/style/Common.nix similarity index 100% rename from home/config/waybar/style/Common.nix rename to home/file/waybar/style/Common.nix diff --git a/home/config/waybar/style/Plugin.nix b/home/file/waybar/style/Plugin.nix similarity index 100% rename from home/config/waybar/style/Plugin.nix rename to home/file/waybar/style/Plugin.nix diff --git a/home/config/waybar/style/Window.nix b/home/file/waybar/style/Window.nix similarity index 100% rename from home/config/waybar/style/Window.nix rename to home/file/waybar/style/Window.nix diff --git a/home/config/yazi/default.nix b/home/file/yazi/default.nix similarity index 100% rename from home/config/yazi/default.nix rename to home/file/yazi/default.nix diff --git a/home/config/yazi/module/Init.nix b/home/file/yazi/module/Init.nix similarity index 100% rename from home/config/yazi/module/Init.nix rename to home/file/yazi/module/Init.nix diff --git a/home/config/yazi/module/Keymap.nix b/home/file/yazi/module/Keymap.nix similarity index 100% rename from home/config/yazi/module/Keymap.nix rename to home/file/yazi/module/Keymap.nix diff --git a/home/config/yazi/module/Theme.nix b/home/file/yazi/module/Theme.nix similarity index 100% rename from home/config/yazi/module/Theme.nix rename to home/file/yazi/module/Theme.nix diff --git a/home/config/yazi/module/Yazi.nix b/home/file/yazi/module/Yazi.nix similarity index 100% rename from home/config/yazi/module/Yazi.nix rename to home/file/yazi/module/Yazi.nix diff --git a/home/variable/default.nix b/home/variable/default.nix deleted file mode 100644 index c718e08f..00000000 --- a/home/variable/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, ... }: { - # Default text editor. - EDITOR = "nvim"; - - # App to use for man pages. - MANPAGER = "nvim +Man!"; - - # Allow unfree packages in shell. - NIXPKGS_ALLOW_UNFREE = "1"; - - # Current system architecture. - NIX_CURRENT_SYSTEM = "${pkgs.stdenv.system}"; - - # Enable Mangohud by default. - MANGOHUD = "1"; - - # Use fsync for Wine. - WINEFSYNC = "1"; - - # Disable Firefox profile switching on rebuild. - MOZ_LEGACY_PROFILES = "1"; - - # GTK apps compat. - GTK_CSD = 0; - - # Terminal settings. - TERM = "xterm-256color"; -}