Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
2026-05-07 21:43:05 +09:00
2 changed files with 28 additions and 16 deletions

View File

@@ -4,6 +4,7 @@
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";

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ inputs, pkgs, ... }:
{
imports = [
@@ -19,7 +19,8 @@
"Xft.dpi" = 172;
};
home.packages = let
home.packages =
let
fonts = import ./pkgs/fonts.nix { inherit pkgs; };
minecraft = import ./pkgs/minecraft.nix { inherit pkgs; };
misc = import ./pkgs/misc.nix { inherit pkgs; };
@@ -28,11 +29,21 @@
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;
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";
}