This commit is contained in:
joy 2024-10-06 12:57:02 +02:00
parent dbe4070da9
commit ad2e414276
13 changed files with 81 additions and 17 deletions

View file

@ -94,11 +94,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1728100995, "lastModified": 1728187412,
"narHash": "sha256-d5DeaW4zN2qADEGXt7c6pMApRRP/tmFneCMPKeC9lrc=", "narHash": "sha256-KIJdXDYnaU6rHhzmLaVRjccwxIIaMBZXBRPGqUVyPiU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "c0179f5534ee6a12e475842f6865c91719320b14", "rev": "40e077fcddef8fadcb796a20f2e69ee752af4545",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

View file

@ -1,7 +1,7 @@
{ {
networking.hostName = "desktop"; networking.hostName = "desktop";
services.hardware.openrgb.enable = true;
hardware.amdgpu.opencl.enable = true; openrgb.enable = true;
imports = [ imports = [
./hardware.nix ./hardware.nix

View file

@ -1,9 +1,9 @@
{ {
networking.hostName = "laptop"; networking.hostName = "laptop";
# services.xserver.desktopManager.gnome.enable = true;
hypridle.enable = true; hypridle.enable = true;
led.enable = true; led.enable = true;
# gnome.enable = true;
imports = [ imports = [
./hardware.nix ./hardware.nix

View file

@ -8,12 +8,7 @@
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
theme = lib.mkForce "~/nix/modules/apps/home/rofi/gruvbox-material.rasi"; theme = lib.mkForce "~/nix/modules/apps/home/rofi/gruvbox-material.rasi";
extraConfig = { extraConfig = {
display-ssh = "";
display-run = "";
display-drun = ""; display-drun = "";
display-dmenu = "";
display-window = "";
display-combi = "";
show-icons = true; show-icons = true;
terminal = "alacritty"; terminal = "alacritty";
}; };

View file

@ -54,5 +54,6 @@
pipes pipes
pulseaudioFull pulseaudioFull
cmus cmus
adwaita-icon-theme
]; ];
} }

View file

@ -5,6 +5,5 @@
./hardware ./hardware
./services ./services
./system ./system
./games
]; ];
} }

View file

@ -2,6 +2,7 @@
imports = [ imports = [
./powerkey ./powerkey
./bluetooth ./bluetooth
./openrgb
./sound ./sound
./boot ./boot
./led ./led

View file

@ -0,0 +1,13 @@
{
config,
lib,
...
}: {
options = {
openrgb.enable = lib.mkEnableOption "";
};
config = lib.mkIf config.openrgb.enable {
services.hardware.openrgb.enable = true;
};
}

View file

@ -3,7 +3,7 @@
./user ./user
./homemanger ./homemanger
./xdg ./xdg
./appimage # ./appimage
./networking ./networking
./misc ./misc
]; ];

View file

@ -5,6 +5,7 @@
./ags ./ags
./theme ./theme
./clip ./clip
./gnome
./misc ./misc
]; ];
} }

View file

@ -0,0 +1,54 @@
{
config,
lib,
pkgs,
...
}: {
options = {
gnome.enable = lib.mkEnableOption "";
};
config = lib.mkIf config.gnome.enable {
services.xserver.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = with pkgs; [
adwaita-icon-theme
# nixos-background-info This can't be excluded since it's defined locally. So even if we removed all GNOME backgrounds it seems we have to keep the NixOS one.
gnome-backgrounds
gnome-bluetooth
gnome-color-manager
gnome-control-center
gnome-shell-extensions
gnome-themes-extra
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gnome-user-docs
pkgs.orca
pkgs.glib # for gsettings program
pkgs.gnome-menus
pkgs.gtk3.out # for gtk-launch program
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
baobab
epiphany
pkgs.gnome-text-editor
gnome-calculator
gnome-calendar
gnome-characters
gnome-clocks
pkgs.gnome-console
gnome-contacts
gnome-font-viewer
gnome-logs
gnome-maps
gnome-music
gnome-system-monitor
gnome-weather
pkgs.loupe
nautilus
pkgs.gnome-connections
simple-scan
pkgs.snapshot
totem
yelp
];
};
}

View file

@ -77,7 +77,7 @@
"$mod+Shift, W, exec, sh $sciPath/vm.sh" "$mod+Shift, W, exec, sh $sciPath/vm.sh"
"$mod+Shift, Z, exec, grim - | swappy -f -" "$mod+Shift, Z, exec, grim - | swappy -f -"
"$mod, Z, exec, sh $sciPath/screen.sh" "$mod, Z, exec, sh $sciPath/screen.sh"
"$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy" "$mod, V, exec, cliphist list | rofi show -dmenu | cliphist decode | wl-copy"
"$mod, O, exec, sh $sciPath/mpv.sh" "$mod, O, exec, sh $sciPath/mpv.sh"
"$mod+Shift, TAB,hyprexpo:expo, toggleoverview" "$mod+Shift, TAB,hyprexpo:expo, toggleoverview"
# controls # controls

View file

@ -37,12 +37,12 @@ in {
fonts = { fonts = {
monospace = { monospace = {
package = pkgs.nerdfonts.override {fonts = ["DejaVuSansMono"];}; package = pkgs.nerdfonts.override {fonts = ["RobotoMono"];};
name = "DejaVuSansMono"; name = "RobotoMono Nerd Font";
}; };
sizes = { sizes = {
applications = 12; applications = 12;
terminal = 14; terminal = 13;
desktop = 12; desktop = 12;
popups = 12; popups = 12;
}; };