Skip to content

Commit

Permalink
[chore}: update
Browse files Browse the repository at this point in the history
  • Loading branch information
rxyhn committed Dec 31, 2023
1 parent ce26b81 commit 7f36ce2
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 40 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions home/modules/programs/firefox.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
firefox-gnome-theme = inputs.self.packages.${pkgs.system}.firefox-gnome-theme;
in {
home.sessionVariables = {BROWSER = "firefox";};

programs.firefox = {
enable = true;
profiles = {
Expand Down
27 changes: 19 additions & 8 deletions home/modules/programs/gtk.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
{
pkgs,
config,
lib,
pkgs,
...
}: {
home.pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 16;
gtk.enable = true;
x11.enable = true;
}: let
colorschemePath = "/org/gnome/desktop/interface/color-scheme";
dconf = "${pkgs.dconf}/bin/dconf";
dconfDark = lib.hm.dag.entryAfter ["dconfSettings"] ''
${dconf} write ${colorschemePath} "'prefer-dark'"
'';
in {
home = {
activation = {inherit dconfDark;};

pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
gtk.enable = true;
x11.enable = true;
};
};

gtk = {
Expand Down
7 changes: 6 additions & 1 deletion home/modules/programs/xdg.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{pkgs, ...}: let
{
config,
pkgs,
...
}: let
browser = ["firefox"];
associations = {
"text/html" = browser;
Expand All @@ -24,6 +28,7 @@
in {
xdg = {
enable = true;
cacheHome = config.home.homeDirectory + "/.local/cache";

mimeApps = {
enable = true;
Expand Down
1 change: 1 addition & 0 deletions home/modules/windowManager/hyprland/config/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
pointer = config.home.pointerCursor;
in {
exec-once = [
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"hyprctl setcursor ${pointer.name} ${toString pointer.size}"
];

Expand Down
37 changes: 31 additions & 6 deletions home/modules/windowManager/hyprland/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
{
inputs,
lib,
pkgs,
...
}: {
}: let
mkService = lib.recursiveUpdate {
Unit.PartOf = ["graphical-session.target"];
Unit.After = ["graphical-session.target"];
Install.WantedBy = ["graphical-session.target"];
};
in {
imports = [
../../programs/gtk.nix

./config
./services/hyprpaper.nix
# ./services/hyprpaper.nix
./services/polkit-agent.nix
];

Expand Down Expand Up @@ -40,16 +47,34 @@
};
};

wayland.windowManager.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.default;
systemd.enable = true;
};

systemd.user.targets.tray = {
Unit = {
Description = "Home Manager System Tray";
Requires = ["graphical-session-pre.target"];
};
};

wayland.windowManager.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.default;
systemd.enable = true;
systemd.user.services = {
swaybg = mkService {
Unit.Description = "Wallpaper chooser";
Service = {
ExecStart = "${lib.getExe pkgs.swaybg} -m fill -i ${./assets/wallpaper.png}";
Restart = "always";
};
};

cliphist = mkService {
Unit.Description = "Clipboard history";
Service = {
ExecStart = "${pkgs.wl-clipboard}/bin/wl-paste --watch ${lib.getBin pkgs.cliphist}/cliphist store";
Restart = "always";
};
};
};
}
11 changes: 7 additions & 4 deletions hosts/yuki/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ in {
++ [pkgs.cpupower-gui];
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [
"module_blacklist=nouveau"
"iommu=pt"
"i8042.direct"
"i8042.dumbkbd"
"i915.enable_psr=0"
"iommu=pt"
"module_blacklist=nouveau"
"i915.modeset=1"
"nvidia_drm.modeset=1"
"nvidia_drm.fbdev=1"
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
];

Expand All @@ -50,8 +53,9 @@ in {

variables = {
_JAVA_AWT_WM_NONEREPARENTING = "1";
WLR_NO_HARDWARE_CURSORS = "1";
GDK_SCALE = "2";
WLR_NO_HARDWARE_CURSORS = "1";
WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card0";
};
};

Expand Down Expand Up @@ -90,7 +94,6 @@ in {
services = {
fstrim.enable = true;
thermald.enable = true;
power-profiles-daemon.enable = true;

upower = {
enable = true;
Expand Down
13 changes: 11 additions & 2 deletions modules/core.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
}: {
documentation.dev.enable = true;
environment.pathsToLink = ["/share/zsh"];
environment.systemPackages = with pkgs; [
git
starship
];

i18n = {
defaultLocale = "en_US.UTF-8";
Expand All @@ -15,11 +19,16 @@
];
};

hardware.opengl.enable = true;

programs = {
adb.enable = true;
less.enable = true;

java = {
enable = true;
package = pkgs.jre;
};

bash.promptInit = ''eval "$(${pkgs.starship}/bin/starship init bash)"'';
zsh = {
enable = true;
autosuggestions.enable = true;
Expand Down
22 changes: 13 additions & 9 deletions modules/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,19 @@

services = {
geoclue2.enable = true;
gnome.gnome-keyring.enable = true;
gnome = {
glib-networking.enable = true;
gnome-keyring.enable = true;
};
gvfs.enable = true;
power-profiles-daemon.enable = true;
upower.enable = true;
dbus.packages = [pkgs.gcr];
udisks2.enable = true;

dbus = {
packages = with pkgs; [dconf gcr udisks2];
enable = true;
};
udev.packages = with pkgs; [gnome.gnome-settings-daemon android-udev-rules];

pipewire = {
enable = true;
Expand All @@ -105,14 +113,10 @@
rtkit.enable = true;
};

environment.variables.GTK_USE_PORTAL = "1";
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
config = {
common.default = ["gtk"];
hyprland.default = ["gtk" "hyprland"];
};

config.common.default = "*";
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-hyprland
Expand Down
2 changes: 1 addition & 1 deletion modules/network.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
resolved.enable = true;
};

systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
# systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
}

0 comments on commit 7f36ce2

Please sign in to comment.