diff --git a/flake.lock b/flake.lock index d6a16ed..8f7ddd9 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1728100995, - "narHash": "sha256-d5DeaW4zN2qADEGXt7c6pMApRRP/tmFneCMPKeC9lrc=", + "lastModified": 1728187412, + "narHash": "sha256-KIJdXDYnaU6rHhzmLaVRjccwxIIaMBZXBRPGqUVyPiU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c0179f5534ee6a12e475842f6865c91719320b14", + "rev": "40e077fcddef8fadcb796a20f2e69ee752af4545", "type": "gitlab" }, "original": { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 162cee6..a828883 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -1,7 +1,7 @@ { networking.hostName = "desktop"; - services.hardware.openrgb.enable = true; - hardware.amdgpu.opencl.enable = true; + + openrgb.enable = true; imports = [ ./hardware.nix diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 5653d5b..2187ba8 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,9 +1,9 @@ { networking.hostName = "laptop"; - # services.xserver.desktopManager.gnome.enable = true; hypridle.enable = true; led.enable = true; + # gnome.enable = true; imports = [ ./hardware.nix diff --git a/modules/apps/home/rofi/default.nix b/modules/apps/home/rofi/default.nix index d956614..738b664 100644 --- a/modules/apps/home/rofi/default.nix +++ b/modules/apps/home/rofi/default.nix @@ -8,12 +8,7 @@ package = pkgs.rofi-wayland; theme = lib.mkForce "~/nix/modules/apps/home/rofi/gruvbox-material.rasi"; extraConfig = { - display-ssh = ""; - display-run = ""; display-drun = ""; - display-dmenu = ""; - display-window = ""; - display-combi = ""; show-icons = true; terminal = "alacritty"; }; diff --git a/modules/apps/norm/misc/default.nix b/modules/apps/norm/misc/default.nix index 2e29d5d..c00acaf 100644 --- a/modules/apps/norm/misc/default.nix +++ b/modules/apps/norm/misc/default.nix @@ -54,5 +54,6 @@ pipes pulseaudioFull cmus + adwaita-icon-theme ]; } diff --git a/modules/default.nix b/modules/default.nix index 2f51710..8d33567 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,6 +5,5 @@ ./hardware ./services ./system - ./games ]; } diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index d1b1447..c572695 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -2,6 +2,7 @@ imports = [ ./powerkey ./bluetooth + ./openrgb ./sound ./boot ./led diff --git a/modules/hardware/openrgb/default.nix b/modules/hardware/openrgb/default.nix new file mode 100644 index 0000000..b06d3e2 --- /dev/null +++ b/modules/hardware/openrgb/default.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: { + options = { + openrgb.enable = lib.mkEnableOption ""; + }; + + config = lib.mkIf config.openrgb.enable { + services.hardware.openrgb.enable = true; + }; +} diff --git a/modules/system/default.nix b/modules/system/default.nix index 7d91db1..b6cee94 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -3,7 +3,7 @@ ./user ./homemanger ./xdg - ./appimage + # ./appimage ./networking ./misc ]; diff --git a/modules/wm/default.nix b/modules/wm/default.nix index cc7968e..9375578 100644 --- a/modules/wm/default.nix +++ b/modules/wm/default.nix @@ -5,6 +5,7 @@ ./ags ./theme ./clip + ./gnome ./misc ]; } diff --git a/modules/wm/gnome/default.nix b/modules/wm/gnome/default.nix new file mode 100644 index 0000000..3e63b92 --- /dev/null +++ b/modules/wm/gnome/default.nix @@ -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 + ]; + }; +} diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index aca8985..8ebf330 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -77,7 +77,7 @@ "$mod+Shift, W, exec, sh $sciPath/vm.sh" "$mod+Shift, Z, exec, grim - | swappy -f -" "$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+Shift, TAB,hyprexpo:expo, toggleoverview" # controls diff --git a/modules/wm/theme/stylix/default.nix b/modules/wm/theme/stylix/default.nix index c7bdcfe..28f0c01 100644 --- a/modules/wm/theme/stylix/default.nix +++ b/modules/wm/theme/stylix/default.nix @@ -37,12 +37,12 @@ in { fonts = { monospace = { - package = pkgs.nerdfonts.override {fonts = ["DejaVuSansMono"];}; - name = "DejaVuSansMono"; + package = pkgs.nerdfonts.override {fonts = ["RobotoMono"];}; + name = "RobotoMono Nerd Font"; }; sizes = { applications = 12; - terminal = 14; + terminal = 13; desktop = 12; popups = 12; };