refactor: move to hyprland
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ inputs, ... }: {
|
||||
{ ... }: {
|
||||
time.timeZone = "America/New_York";
|
||||
|
||||
# security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
16
host/common/optional/desktop/hyprland.nix
Normal file
16
host/common/optional/desktop/hyprland.nix
Normal file
@@ -0,0 +1,16 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./hyprland/font.nix
|
||||
./hyprland/cursor.nix
|
||||
./hyprland/packages.nix
|
||||
./hyprland/greeter.nix
|
||||
./hyprland/hyprlock.nix
|
||||
];
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
}
|
||||
10
host/common/optional/desktop/hyprland/cursor.nix
Normal file
10
host/common/optional/desktop/hyprland/cursor.nix
Normal file
@@ -0,0 +1,10 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"apple_cursor"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
apple-cursor
|
||||
];
|
||||
}
|
||||
28
host/common/optional/desktop/hyprland/font.nix
Normal file
28
host/common/optional/desktop/hyprland/font.nix
Normal file
@@ -0,0 +1,28 @@
|
||||
{ pkgs, apple-fonts, ... }: {
|
||||
fonts = {
|
||||
fontconfig.defaultFonts = {
|
||||
sansSerif = [ "SF Pro" ];
|
||||
serif = [ "SF Pro" ];
|
||||
monospace = [ "JetBrainsMono Nerd Font" ];
|
||||
};
|
||||
|
||||
packages = with pkgs; [
|
||||
monocraft
|
||||
noto-fonts-cjk-sans
|
||||
nerd-fonts.jetbrains-mono
|
||||
(apple-fonts.packages.${pkgs.system}.sf-pro)
|
||||
(stdenv.mkDerivation {
|
||||
name = "apple-color-emoji";
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/samuelngs/apple-emoji-linux/releases/download/v17.4/AppleColorEmoji.ttf";
|
||||
sha256 = "1wahjmbfm1xgm58madvl21451a04gxham5vz67gqz1cvpi0cjva8";
|
||||
};
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 $src $out/share/fonts/truetype/AppleColorEmoji.ttf
|
||||
'';
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
12
host/common/optional/desktop/hyprland/greeter.nix
Normal file
12
host/common/optional/desktop/hyprland/greeter.nix
Normal file
@@ -0,0 +1,12 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd 'uwsm start hyprland-uwsm.desktop'";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
4
host/common/optional/desktop/hyprland/hyprlock.nix
Normal file
4
host/common/optional/desktop/hyprland/hyprlock.nix
Normal file
@@ -0,0 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
security.pam.services.hyprlock = {};
|
||||
}
|
||||
22
host/common/optional/desktop/hyprland/packages.nix
Normal file
22
host/common/optional/desktop/hyprland/packages.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
hyprpaper
|
||||
hypridle
|
||||
hyprpicker
|
||||
hyprsunset
|
||||
hyprshot
|
||||
waybar
|
||||
walker
|
||||
swayosd
|
||||
|
||||
playerctl
|
||||
brightnessctl
|
||||
wl-clipboard
|
||||
wdisplays
|
||||
|
||||
bluetui
|
||||
|
||||
kdePackages.dolphin
|
||||
];
|
||||
}
|
||||
@@ -26,3 +26,4 @@
|
||||
wl-clipboard # Command-line copy/paste utilities for Wayland
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
fonts.packages = with pkgs; [
|
||||
monocraft
|
||||
noto-fonts-cjk-sans
|
||||
|
||||
(stdenv.mkDerivation {
|
||||
name = "apple-color-emoji";
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/samuelngs/apple-emoji-linux/releases/download/v17.4/AppleColorEmoji.ttf";
|
||||
sha256 = "1wahjmbfm1xgm58madvl21451a04gxham5vz67gqz1cvpi0cjva8";
|
||||
};
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 $src $out/share/fonts/truetype/AppleColorEmoji.ttf
|
||||
'';
|
||||
})
|
||||
];
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
fcitx5.addons = with pkgs; [
|
||||
# fcitx5-gtk # alternatively, kdePackages.fcitx5-qt
|
||||
kdePackages.fcitx5-qt # alternatively, kdePackages.fcitx5-qt
|
||||
fcitx5-chinese-addons # table input method support
|
||||
qt6Packages.fcitx5-chinese-addons # table input method support
|
||||
fcitx5-nord # a color theme
|
||||
];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user