From 4b252ef60886603181c718c6869428c38c4c718d Mon Sep 17 00:00:00 2001 From: asnev Date: Sat, 11 Jul 2026 09:20:33 +0700 Subject: [PATCH] renaming --- config.nix => configuration.nix | 1 - flake.nix | 21 ++++++++----------- .../phostron/{nixos.nix => configuration.nix} | 6 ++++-- ...ardware.nix => hardware-configuration.nix} | 0 users/coyote/{nixos.nix => configuration.nix} | 0 users/coyote/programs/vim.nix | 14 +------------ 6 files changed, 14 insertions(+), 28 deletions(-) rename config.nix => configuration.nix (99%) rename hosts/phostron/{nixos.nix => configuration.nix} (76%) rename hosts/phostron/{hardware.nix => hardware-configuration.nix} (100%) rename users/coyote/{nixos.nix => configuration.nix} (100%) diff --git a/config.nix b/configuration.nix similarity index 99% rename from config.nix rename to configuration.nix index acc3fd7..c7bc523 100644 --- a/config.nix +++ b/configuration.nix @@ -55,7 +55,6 @@ gcc clang # system utils - literate firmware-updater mtr gnupg diff --git a/flake.nix b/flake.nix index 37ad3c9..b1757c5 100644 --- a/flake.nix +++ b/flake.nix @@ -41,20 +41,17 @@ ]; }; }) - ./hosts/phostron/nixos.nix - ./profiles/kde.nix - ./users/coyote/nixos.nix - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.coyote.imports = [./users/coyote/home.nix]; - }; - } + ./hosts/phostron/configuration.nix ]; }; }; + + homeConfigurations.coyote = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + extraSpecialArgs = {inherit inputs;}; + modules = [ + ./users/coyote/home.nix + ]; + }; }; } diff --git a/hosts/phostron/nixos.nix b/hosts/phostron/configuration.nix similarity index 76% rename from hosts/phostron/nixos.nix rename to hosts/phostron/configuration.nix index 829b36a..376dc57 100644 --- a/hosts/phostron/nixos.nix +++ b/hosts/phostron/configuration.nix @@ -1,7 +1,9 @@ {...}: { imports = [ - ./hardware.nix - ../../config.nix + ./hardware-configuration.nix + ../../configuration.nix + ../../profiles/kde.nix + ../../users/coyote/configuration.nix ]; system.stateVersion = "26.05"; # I hope you know what you're doing. :) diff --git a/hosts/phostron/hardware.nix b/hosts/phostron/hardware-configuration.nix similarity index 100% rename from hosts/phostron/hardware.nix rename to hosts/phostron/hardware-configuration.nix diff --git a/users/coyote/nixos.nix b/users/coyote/configuration.nix similarity index 100% rename from users/coyote/nixos.nix rename to users/coyote/configuration.nix diff --git a/users/coyote/programs/vim.nix b/users/coyote/programs/vim.nix index b1d810b..60b1e5a 100644 --- a/users/coyote/programs/vim.nix +++ b/users/coyote/programs/vim.nix @@ -2,17 +2,7 @@ pkgs, lib, ... -}: let - literate-vim = pkgs.vimUtils.buildVimPlugin { - name = "literate.vim"; - src = pkgs.fetchFromGitHub { - owner = "zyedidia"; - repo = "literate.vim"; - rev = "4ffd45cb1657b67f4ed0eb639478a69209ec1f94"; - sha256 = "sha256-X5iJyjeLBkKh4tUoDG8VDO6DwYVOI9DpRqpic8NinwA="; - }; - }; -in { +}: { programs.vim = { enable = true; packageConfigurable = pkgs.unstable.vim-full; @@ -20,8 +10,6 @@ in { gruvbox rainbow vim-indent-guides - literate-vim - neomake ]; defaultEditor = true; extraConfig = ''