szymon/amazing-dotfiles
1
0
Fork 0
mirror of https://github.com/szymon-jozef/amazing-dotfiles.git synced 2026-09-07 12:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

branching — not good idea...

Browse Source
This commit is contained in:
Szymon P
2026-02-27 20:58:22 +01:00
parent 033a5fae07
commit cbc68e2b5a
2 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
flake.nix
View File

@@ -51,45 +51,45 @@
};
system = "x86_64-linux";
general_import = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
general_special_args = {
inherit
inputs
userConfig
;
};
general_module_import = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
];
in
{
homeConfigurations = {
"arch" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
extraSpecialArgs = {
inherit
inputs
userConfig
;
pkgs = general_import;
extraSpecialArgs = general_special_args // {
isNixOS = false;
};
modules = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
];
modules = general_module_import;
};
"nixos" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
extraSpecialArgs = {
inherit
inputs
userConfig
;
pkgs = general_import;
extraSpecialArgs = general_special_args // {
isNixOS = true;
};
modules = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
];
modules = general_module_import;
};
};
};

10
modules/hypr/hyprland.nix
View File

@@ -3,6 +3,7 @@
lib,
userConfig,
pkgs,
inputs,
...
}:
let
@@ -24,7 +25,12 @@ in
{
wayland.windowManager.hyprland = {
enable = true;
package = lib.mkIf (!isNixOS) null;
package =
if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
portalPackage = lib.mkIf (
isNixOS
) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
xwayland.enable = true;
settings = {
"$mainMod" = "SUPER";
@@ -50,7 +56,7 @@ in
"col.inactive_border" = "$overlay1";
resize_on_border = false;
allow_tearing = false;
layout = "dwindle";
layout = if isNixOS then "scrolling" else "dwindle"; # i use hyprland-git on nixos
};
animations = {