update hyprland

This commit is contained in:
2026-05-07 21:41:52 +09:00
parent d00f43a12e
commit 69b88803eb
2 changed files with 45 additions and 26 deletions

View File

@@ -4,26 +4,34 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
helix.url = "github:helix-editor/helix/master";
hyprland.url = "github:hyprwm/Hyprland";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, home-manager, ... }@inputs: {
nixosConfigurations.haskell = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
outputs =
{
self,
nixpkgs,
home-manager,
...
}@inputs:
{
nixosConfigurations.haskell = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.allen = import ./home.nix;
}
];
home-manager.users.allen = import ./home.nix;
}
];
};
};
};
}

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ inputs, pkgs, ... }:
{
imports = [
@@ -19,20 +19,31 @@
"Xft.dpi" = 172;
};
home.packages = let
fonts = import ./pkgs/fonts.nix { inherit pkgs; };
minecraft = import ./pkgs/minecraft.nix { inherit pkgs; };
misc = import ./pkgs/misc.nix { inherit pkgs; };
network = import ./pkgs/network.nix { inherit pkgs; };
programming = import ./pkgs/programming.nix { inherit pkgs; };
tools = import ./pkgs/tools.nix { inherit pkgs; };
util = import ./pkgs/util.nix { inherit pkgs; };
games = import ./pkgs/games.nix { inherit pkgs; };
in fonts ++ minecraft ++ misc ++ network ++ programming ++ tools ++ util
++ games;
home.packages =
let
fonts = import ./pkgs/fonts.nix { inherit pkgs; };
minecraft = import ./pkgs/minecraft.nix { inherit pkgs; };
misc = import ./pkgs/misc.nix { inherit pkgs; };
network = import ./pkgs/network.nix { inherit pkgs; };
programming = import ./pkgs/programming.nix { inherit pkgs; };
tools = import ./pkgs/tools.nix { inherit pkgs; };
util = import ./pkgs/util.nix { inherit pkgs; };
games = import ./pkgs/games.nix { inherit pkgs; };
in
fonts ++ minecraft ++ misc ++ network ++ programming ++ tools ++ util ++ games;
programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true;
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
extraConfig = ''
source = ~/.config/hypr/common.conf
source = ~/.config/hypr/device/laptop.conf
'';
};
home.stateVersion = "25.05";
}