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 = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
helix.url = "github:helix-editor/helix/master"; helix.url = "github:helix-editor/helix/master";
hyprland.url = "github:hyprwm/Hyprland";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -30,10 +31,10 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = 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 = [ imports = [
@@ -19,20 +19,31 @@
"Xft.dpi" = 172; "Xft.dpi" = 172;
}; };
home.packages = let home.packages =
fonts = import ./pkgs/fonts.nix { inherit pkgs; }; let
minecraft = import ./pkgs/minecraft.nix { inherit pkgs; }; fonts = import ./pkgs/fonts.nix { inherit pkgs; };
misc = import ./pkgs/misc.nix { inherit pkgs; }; minecraft = import ./pkgs/minecraft.nix { inherit pkgs; };
network = import ./pkgs/network.nix { inherit pkgs; }; misc = import ./pkgs/misc.nix { inherit pkgs; };
programming = import ./pkgs/programming.nix { inherit pkgs; }; network = import ./pkgs/network.nix { inherit pkgs; };
tools = import ./pkgs/tools.nix { inherit pkgs; }; programming = import ./pkgs/programming.nix { inherit pkgs; };
util = import ./pkgs/util.nix { inherit pkgs; }; tools = import ./pkgs/tools.nix { inherit pkgs; };
games = import ./pkgs/games.nix { inherit pkgs; }; util = import ./pkgs/util.nix { inherit pkgs; };
in fonts ++ minecraft ++ misc ++ network ++ programming ++ tools ++ util games = import ./pkgs/games.nix { inherit pkgs; };
++ games; in
fonts ++ minecraft ++ misc ++ network ++ programming ++ tools ++ util ++ games;
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.nix-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"; home.stateVersion = "25.05";
} }