diff --git a/devices/ideapad-slim-5/configuration.nix b/devices/ideapad-slim-5/configuration.nix index bea3938..ddad59d 100755 --- a/devices/ideapad-slim-5/configuration.nix +++ b/devices/ideapad-slim-5/configuration.nix @@ -4,9 +4,6 @@ pkgs, ... }: -let - ENABLE_HDR = false; -in { imports = [ ./hardware-configuration.nix @@ -37,100 +34,6 @@ in "flakes" ]; - device = { - flake-name = "ideapad-slim-5"; - cursors = "aemeath"; - - dm.sddm.enable = true; - dm.gdm.enable = false; - - de.kdePlasma.enable = false; - de.gnome.enable = false; - - wm.niri.enable = false; - wm.hyprland.enable = true; - wm.hyprland.monitors = [ - ( - { - output = "eDP-1"; - mode = "1920x1200@60"; - position = "0x0"; - scale = 1; - } - // lib.optionalAttrs ENABLE_HDR { - bitdepth = 10; - cm = "hdr"; - supports_wide_color = 1; - supports_hdr = 1; - - sdrbrightness = 1.0; - sdrsaturation = 1.0; - - sdr_min_luminance = 0.005; - sdr_max_luminance = 200; - - min_luminance = 0.0005; - max_luminance = 400; - max_avg_luminance = 250; - - sdr_eotf = 2; - } - ) - ]; - - bluetooth.enable = true; - flatpak.enable = true; - - files = { - force = { - ".config/dolphinrc" = true; - }; - - mkForce = { - ".mozilla/firefox/default/search.json.mozlz4" = true; - }; - - source = { - ".config/qt5ct/colors/Catppuccin-Mocha.conf" = - "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf"; - ".config/qt6ct/colors/Catppuccin-Mocha.conf" = - "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf"; - - ".config/dolphinrc" = libs.root "/configs/dolphinrc"; - - ".local/share/kio/servicemenus/copy-server-public-url.desktop" = - libs.root "/configs/services-menu/copy-server-public-url.desktop"; - ".local/share/kio/servicemenus/open-with-code.desktop" = - libs.root "/configs/services-menu/open-with-code.desktop"; - ".local/share/kio/servicemenus/open-with-nvim.desktop" = - libs.root "/configs/services-menu/open-with-nvim.desktop"; - ".local/share/kio/servicemenus/open-with-antigravity.desktop" = - libs.root "/configs/services-menu/open-with-antigravity.desktop"; - ".local/share/kio/servicemenus/open-ghostty-here.desktop" = - libs.root "/configs/services-menu/open-ghostty-here.desktop"; - }; - - symlink = { - "SteamApps" = ".local/share/Steam/steamapps"; - "Development/Quickshell" = ".config/quickshell"; - # "Development/KDE-Widget" = ".local/share/plasma/plasmoids"; - # "Development/SplashScreen" = ".local/share/plasma/look-and-feel"; - # "Development/DesktopEffects" = ".local/share/kwin/effects"; - }; - }; - - programs = { - terminal = "ghostty"; - obs-studio.enable = true; - nixcord.enable = true; - tmux.enable = true; - starship.enable = true; - fastfetch.enable = true; - cider-2.enable = true; - steam.enable = true; - }; - }; - boot.kernelPackages = pkgs.linuxPackages_latest; boot.extraModulePackages = [ pkgs.linuxPackages_latest.zenpower ]; system.stateVersion = "25.11"; diff --git a/host/desktop/default.nix b/host/desktop/default.nix index d304995..4f7bdc2 100644 --- a/host/desktop/default.nix +++ b/host/desktop/default.nix @@ -8,6 +8,7 @@ { imports = [ ./programs.nix + ./device.nix (libs.root "/modules/hardware/default.nix") diff --git a/host/desktop/device.nix b/host/desktop/device.nix new file mode 100644 index 0000000..5fb7061 --- /dev/null +++ b/host/desktop/device.nix @@ -0,0 +1,99 @@ +{ lib, ... }: +let + ENABLE_HDR = false; +in +{ + device = { + flake-name = "ideapad-slim-5"; + cursors = "aemeath"; + + dm.sddm.enable = true; + dm.gdm.enable = false; + + de.kdePlasma.enable = false; + de.gnome.enable = false; + + wm.niri.enable = false; + wm.hyprland.enable = true; + wm.hyprland.monitors = [ + ( + { + output = "eDP-1"; + mode = "1920x1200@60"; + position = "0x0"; + scale = 1; + } + // lib.optionalAttrs ENABLE_HDR { + bitdepth = 10; + cm = "hdr"; + supports_wide_color = 1; + supports_hdr = 1; + + sdrbrightness = 1.0; + sdrsaturation = 1.0; + + sdr_min_luminance = 0.005; + sdr_max_luminance = 200; + + min_luminance = 0.0005; + max_luminance = 400; + max_avg_luminance = 250; + + sdr_eotf = 2; + } + ) + ]; + + bluetooth.enable = true; + flatpak.enable = true; + + files = { + force = { + ".config/dolphinrc" = true; + }; + + mkForce = { + ".mozilla/firefox/default/search.json.mozlz4" = true; + }; + + source = { + ".config/qt5ct/colors/Catppuccin-Mocha.conf" = + "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf"; + ".config/qt6ct/colors/Catppuccin-Mocha.conf" = + "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf"; + + ".config/dolphinrc" = libs.root "/configs/dolphinrc"; + + ".local/share/kio/servicemenus/copy-server-public-url.desktop" = + libs.root "/configs/services-menu/copy-server-public-url.desktop"; + ".local/share/kio/servicemenus/open-with-code.desktop" = + libs.root "/configs/services-menu/open-with-code.desktop"; + ".local/share/kio/servicemenus/open-with-nvim.desktop" = + libs.root "/configs/services-menu/open-with-nvim.desktop"; + ".local/share/kio/servicemenus/open-with-antigravity.desktop" = + libs.root "/configs/services-menu/open-with-antigravity.desktop"; + ".local/share/kio/servicemenus/open-ghostty-here.desktop" = + libs.root "/configs/services-menu/open-ghostty-here.desktop"; + }; + + symlink = { + "SteamApps" = ".local/share/Steam/steamapps"; + "Development/Quickshell" = ".config/quickshell"; + # "Development/KDE-Widget" = ".local/share/plasma/plasmoids"; + # "Development/SplashScreen" = ".local/share/plasma/look-and-feel"; + # "Development/DesktopEffects" = ".local/share/kwin/effects"; + }; + }; + + programs = { + terminal = "ghostty"; + obs-studio.enable = true; + nixcord.enable = true; + tmux.enable = true; + starship.enable = true; + fastfetch.enable = true; + cider-2.enable = true; + steam.enable = true; + }; + }; +}