diff --git a/configs/.config/ranger/rc.conf b/configs/.config/ranger/rc.conf deleted file mode 100644 index 5105b14..0000000 --- a/configs/.config/ranger/rc.conf +++ /dev/null @@ -1,12 +0,0 @@ -set preview_images true -set preview_images_method ueberzug - -# Show VCS info -set vcs_aware true - -default_linemode devicons - -set viewmode miller - -map exit -map ,x exit diff --git a/flake.nix b/flake.nix index 1409b68..aaec901 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,6 @@ useGlobalPkgs = true; useUserPackages = true; - # Конфигурация для пользователя users.${username} = import ./home/users/${username}.nix; # Дополнительные аргументы для home-manager @@ -50,28 +49,20 @@ }; }; } - - # Собственные модули - ./modules/common - ./modules/desktop - ] ++ extraModules; }; in { - # Конфигурации для разных хостов nixosConfigurations = { - # Основной рабочий ПК desktop = mkHost { hostname = "thek4n.ru"; username = "thek4n"; extraModules = [ - ./hosts/thek4n.ru/hardware.nix + ./hosts/thek4n/hardware.nix ]; }; }; - # Для удобства разработки devShells.${system}.default = nixpkgs.legacyPackages.${system}.mkShell { buildInputs = with nixpkgs.legacyPackages.${system}; [ nixpkgs-fmt diff --git a/home/users/thek4n.nix b/home/users/thek4n.nix index 1672469..61de1b6 100644 --- a/home/users/thek4n.nix +++ b/home/users/thek4n.nix @@ -41,15 +41,22 @@ defaultEditor = true; }; - programs.git = { - enable = true; - userName = "thek4n"; - userEmail = "thek4n@yandex.ru"; + home.file = { + ".config/sway".source = ../../configs/.config/sway; + ".config/swaylock".source = ../../configs/.config/swaylock; + ".config/waybar".source = ../../configs/.config/waybar; + ".config/mako".source = ../../configs/.config/mako; + ".config/kanshi".source = ../../configs/.config/kanshi; + ".config/rofi".source = ../../configs/.config/rofi; + ".config/yazi".source = ../../configs/.config/yazi; + ".config/tmux".source = ../../configs/.config/tmux; + ".config/alacritty".source = ../../configs/.config/alacritty; + ".config/nvim".source = ../../configs/.config/nvim; + ".config/zsh".source = ../../configs/.config/zsh; + ".config/git".source = ../../configs/.config/git; + ".zshenv".source = ../../configs/.zshenv; + ".editorconfig".source = ../../configs/.editorconfig; }; - - # home.file.".config/nvim/init.lua".source = ./nvim/init.lua; - # home.file.".zshrc".source = ./zsh/.zshrc; - # home.file.".gitconfig".source = ./git/.gitconfig; }; }; };