From 0ea1cb162d8d2f5816d5b28ef786f198d24698f9 Mon Sep 17 00:00:00 2001 From: iFargle Date: Fri, 5 Jan 2024 16:10:10 +0900 Subject: [PATCH] Update config --- flake.nix | 4 +- .../hyprland/{ => assets}/waybar/scripts.nix | 0 .../{ => assets}/wlogout/hibernate.png | Bin .../hyprland/{ => assets}/wlogout/lock.png | Bin .../hyprland/{ => assets}/wlogout/logout.png | Bin .../hyprland/{ => assets}/wlogout/reboot.png | Bin .../{ => assets}/wlogout/shutdown.png | Bin .../hyprland/{ => assets}/wlogout/suspend.png | Bin .../desktops/hyprland/colors/stylix.nix | 7 +++ .../{stylix => components}/default.nix | 1 + .../{stylix => components}/hyprland.nix | 0 .../hyprland/{stylix => components}/mako.nix | 0 .../hyprland/{stylix => components}/rofi.nix | 0 .../{stylix => components}/swaylock.nix | 0 .../desktops/hyprland/components/swayosd.nix | 3 ++ .../{stylix => components}/waybar.nix | 0 .../{stylix => components}/wlogout.nix | 0 .../common/desktops/hyprland/default.nix | 11 ++-- .../hyprland/hyprland/hyprland-binds.nix | 21 -------- .../hyprland/swayosd/swayosd-conf.nix | 3 -- .../hyprland/wlogout/wlogout-conf.nix | 44 --------------- home-manager/common/desktops/xfce/default.nix | 0 .../desktops/xfce/themes/default/default.nix | 4 -- .../desktops/xfce/themes/gruvbox/default.nix | 4 -- .../nixos-desktop/desktops/xfce/default.nix | 3 -- .../nixos-framework/desktops/xfce/default.nix | 3 -- .../desktops/hyprland/default.nix | 51 ------------------ .../desktops/xfce/default.nix | 3 -- home-manager/small.nix | 3 +- lib/default.nix | 18 +++---- nixos/common/desktops/gnome/default.nix | 11 ---- nixos/common/desktops/gnome/themes/arc.nix | 5 -- nixos/common/desktops/gnome/themes/fluent.nix | 6 --- .../common/desktops/gnome/themes/gruvbox.nix | 7 --- nixos/common/desktops/gnome/themes/nordic.nix | 7 --- .../desktops/gnome/themes/tokyo-night.nix | 5 -- nixos/common/desktops/gnome/themes/vimix.nix | 6 --- .../desktops/hyprland/colors/stylix.nix | 7 +++ nixos/common/desktops/hyprland/default.nix | 10 ++-- nixos/common/desktops/xfce/default.nix | 40 -------------- 40 files changed, 39 insertions(+), 248 deletions(-) rename home-manager/common/desktops/hyprland/{ => assets}/waybar/scripts.nix (100%) rename home-manager/common/desktops/hyprland/{ => assets}/wlogout/hibernate.png (100%) rename home-manager/common/desktops/hyprland/{ => assets}/wlogout/lock.png (100%) rename home-manager/common/desktops/hyprland/{ => assets}/wlogout/logout.png (100%) rename home-manager/common/desktops/hyprland/{ => assets}/wlogout/reboot.png (100%) rename home-manager/common/desktops/hyprland/{ => assets}/wlogout/shutdown.png (100%) rename home-manager/common/desktops/hyprland/{ => assets}/wlogout/suspend.png (100%) create mode 100644 home-manager/common/desktops/hyprland/colors/stylix.nix rename home-manager/common/desktops/hyprland/{stylix => components}/default.nix (88%) rename home-manager/common/desktops/hyprland/{stylix => components}/hyprland.nix (100%) rename home-manager/common/desktops/hyprland/{stylix => components}/mako.nix (100%) rename home-manager/common/desktops/hyprland/{stylix => components}/rofi.nix (100%) rename home-manager/common/desktops/hyprland/{stylix => components}/swaylock.nix (100%) create mode 100644 home-manager/common/desktops/hyprland/components/swayosd.nix rename home-manager/common/desktops/hyprland/{stylix => components}/waybar.nix (100%) rename home-manager/common/desktops/hyprland/{stylix => components}/wlogout.nix (100%) delete mode 100644 home-manager/common/desktops/hyprland/hyprland/hyprland-binds.nix delete mode 100644 home-manager/common/desktops/hyprland/swayosd/swayosd-conf.nix delete mode 100644 home-manager/common/desktops/hyprland/wlogout/wlogout-conf.nix delete mode 100644 home-manager/common/desktops/xfce/default.nix delete mode 100644 home-manager/common/desktops/xfce/themes/default/default.nix delete mode 100644 home-manager/common/desktops/xfce/themes/gruvbox/default.nix delete mode 100644 home-manager/hosts/nixos-desktop/desktops/xfce/default.nix delete mode 100644 home-manager/hosts/nixos-framework/desktops/xfce/default.nix delete mode 100644 home-manager/hosts/nixos-iso-desktop/desktops/hyprland/default.nix delete mode 100644 home-manager/hosts/nixos-iso-desktop/desktops/xfce/default.nix delete mode 100644 nixos/common/desktops/gnome/themes/arc.nix delete mode 100644 nixos/common/desktops/gnome/themes/fluent.nix delete mode 100644 nixos/common/desktops/gnome/themes/gruvbox.nix delete mode 100644 nixos/common/desktops/gnome/themes/nordic.nix delete mode 100644 nixos/common/desktops/gnome/themes/tokyo-night.nix delete mode 100644 nixos/common/desktops/gnome/themes/vimix.nix create mode 100644 nixos/common/desktops/hyprland/colors/stylix.nix delete mode 100644 nixos/common/desktops/xfce/default.nix diff --git a/flake.nix b/flake.nix index 4768b0a5..2ceac23d 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ framework-server = libx.mkHost { hostname = "framework-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; desktop = "plasma6"; gpu = "nvidia"; }; - nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd"; theme = "stylix"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd"; color = "stylix"; }; backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; platform = "aarch64-linux"; type = "small"; }; piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; platform = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; platform = "aarch64-linux"; type = "small"; }; @@ -63,7 +63,7 @@ "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "plasma6"; }; - "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "stylix"; }; + "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; color = "stylix"; }; "albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; platform = "aarch64-linux"; type = "small"; }; "albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; platform = "aarch64-linux"; type = "small"; }; "albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; platform = "aarch64-linux"; type = "small"; }; diff --git a/home-manager/common/desktops/hyprland/waybar/scripts.nix b/home-manager/common/desktops/hyprland/assets/waybar/scripts.nix similarity index 100% rename from home-manager/common/desktops/hyprland/waybar/scripts.nix rename to home-manager/common/desktops/hyprland/assets/waybar/scripts.nix diff --git a/home-manager/common/desktops/hyprland/wlogout/hibernate.png b/home-manager/common/desktops/hyprland/assets/wlogout/hibernate.png similarity index 100% rename from home-manager/common/desktops/hyprland/wlogout/hibernate.png rename to home-manager/common/desktops/hyprland/assets/wlogout/hibernate.png diff --git a/home-manager/common/desktops/hyprland/wlogout/lock.png b/home-manager/common/desktops/hyprland/assets/wlogout/lock.png similarity index 100% rename from home-manager/common/desktops/hyprland/wlogout/lock.png rename to home-manager/common/desktops/hyprland/assets/wlogout/lock.png diff --git a/home-manager/common/desktops/hyprland/wlogout/logout.png b/home-manager/common/desktops/hyprland/assets/wlogout/logout.png similarity index 100% rename from home-manager/common/desktops/hyprland/wlogout/logout.png rename to home-manager/common/desktops/hyprland/assets/wlogout/logout.png diff --git a/home-manager/common/desktops/hyprland/wlogout/reboot.png b/home-manager/common/desktops/hyprland/assets/wlogout/reboot.png similarity index 100% rename from home-manager/common/desktops/hyprland/wlogout/reboot.png rename to home-manager/common/desktops/hyprland/assets/wlogout/reboot.png diff --git a/home-manager/common/desktops/hyprland/wlogout/shutdown.png b/home-manager/common/desktops/hyprland/assets/wlogout/shutdown.png similarity index 100% rename from home-manager/common/desktops/hyprland/wlogout/shutdown.png rename to home-manager/common/desktops/hyprland/assets/wlogout/shutdown.png diff --git a/home-manager/common/desktops/hyprland/wlogout/suspend.png b/home-manager/common/desktops/hyprland/assets/wlogout/suspend.png similarity index 100% rename from home-manager/common/desktops/hyprland/wlogout/suspend.png rename to home-manager/common/desktops/hyprland/assets/wlogout/suspend.png diff --git a/home-manager/common/desktops/hyprland/colors/stylix.nix b/home-manager/common/desktops/hyprland/colors/stylix.nix new file mode 100644 index 00000000..d69f7f2a --- /dev/null +++ b/home-manager/common/desktops/hyprland/colors/stylix.nix @@ -0,0 +1,7 @@ +{lib, inputs, pkgs, gpu, platform, color, ...}: { + stylix = { + image = /etc/nixos/git/wallpapers/${color}/wallpaper2.jpg; + polarity = "dark"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; + }; +} \ No newline at end of file diff --git a/home-manager/common/desktops/hyprland/stylix/default.nix b/home-manager/common/desktops/hyprland/components/default.nix similarity index 88% rename from home-manager/common/desktops/hyprland/stylix/default.nix rename to home-manager/common/desktops/hyprland/components/default.nix index fb939503..ecf66c98 100644 --- a/home-manager/common/desktops/hyprland/stylix/default.nix +++ b/home-manager/common/desktops/hyprland/components/default.nix @@ -4,6 +4,7 @@ ./mako.nix ./rofi.nix ./swaylock.nix + ./swayosd.nix ./waybar.nix ./wlogout.nix ]; diff --git a/home-manager/common/desktops/hyprland/stylix/hyprland.nix b/home-manager/common/desktops/hyprland/components/hyprland.nix similarity index 100% rename from home-manager/common/desktops/hyprland/stylix/hyprland.nix rename to home-manager/common/desktops/hyprland/components/hyprland.nix diff --git a/home-manager/common/desktops/hyprland/stylix/mako.nix b/home-manager/common/desktops/hyprland/components/mako.nix similarity index 100% rename from home-manager/common/desktops/hyprland/stylix/mako.nix rename to home-manager/common/desktops/hyprland/components/mako.nix diff --git a/home-manager/common/desktops/hyprland/stylix/rofi.nix b/home-manager/common/desktops/hyprland/components/rofi.nix similarity index 100% rename from home-manager/common/desktops/hyprland/stylix/rofi.nix rename to home-manager/common/desktops/hyprland/components/rofi.nix diff --git a/home-manager/common/desktops/hyprland/stylix/swaylock.nix b/home-manager/common/desktops/hyprland/components/swaylock.nix similarity index 100% rename from home-manager/common/desktops/hyprland/stylix/swaylock.nix rename to home-manager/common/desktops/hyprland/components/swaylock.nix diff --git a/home-manager/common/desktops/hyprland/components/swayosd.nix b/home-manager/common/desktops/hyprland/components/swayosd.nix new file mode 100644 index 00000000..7bf88a45 --- /dev/null +++ b/home-manager/common/desktops/hyprland/components/swayosd.nix @@ -0,0 +1,3 @@ +{ + services.swayosd.enable = true; +} \ No newline at end of file diff --git a/home-manager/common/desktops/hyprland/stylix/waybar.nix b/home-manager/common/desktops/hyprland/components/waybar.nix similarity index 100% rename from home-manager/common/desktops/hyprland/stylix/waybar.nix rename to home-manager/common/desktops/hyprland/components/waybar.nix diff --git a/home-manager/common/desktops/hyprland/stylix/wlogout.nix b/home-manager/common/desktops/hyprland/components/wlogout.nix similarity index 100% rename from home-manager/common/desktops/hyprland/stylix/wlogout.nix rename to home-manager/common/desktops/hyprland/components/wlogout.nix diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix index c19d22bf..7a4d0365 100644 --- a/home-manager/common/desktops/hyprland/default.nix +++ b/home-manager/common/desktops/hyprland/default.nix @@ -1,9 +1,9 @@ -{ pkgs, inputs, theme, ... }: { +{ pkgs, inputs, theme, color, ... }: { imports = [ inputs.stylix.homeManagerModules.stylix - ./stylix - ./swayosd/swayosd.nix - ./waybar/scripts.nix + ./colors/${color}.nix + ./components + ./assets/waybar/scripts.nix ]; services.gammastep = { @@ -17,10 +17,7 @@ gtk.enable = true; stylix = { - image = /etc/nixos/git/wallpapers/stylix/wallpaper2.jpg; autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; - polarity = "dark"; targets = { vscode.enable = true; kitty = { diff --git a/home-manager/common/desktops/hyprland/hyprland/hyprland-binds.nix b/home-manager/common/desktops/hyprland/hyprland/hyprland-binds.nix deleted file mode 100644 index 6e5c61f6..00000000 --- a/home-manager/common/desktops/hyprland/hyprland/hyprland-binds.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ theme, ... }: { - wayland.windowManager.hyprland = { - settings = { - extraConfig = '' - # Resize - bind = SUPER, R, exec, notify-send "Entered resize mode. Press ESC to quit." - bind = SUPER, R, submap, resize - submap = resize - binde = , H, resizeactive,-50 0 - binde = , L, resizeactive,50 0 - binde = , K, resizeactive,0 -50 - binde = , J, resizeactive,0 50 - binde = , left, resizeactive,-50 0 - binde = , right, resizeactive,50 0 - binde = , up, resizeactive,0 -50 - binde = , down, resizeactive,0 50 - bind = , escape, submap, reset - submap = reset - ''; - }; -} diff --git a/home-manager/common/desktops/hyprland/swayosd/swayosd-conf.nix b/home-manager/common/desktops/hyprland/swayosd/swayosd-conf.nix deleted file mode 100644 index 0942eaa0..00000000 --- a/home-manager/common/desktops/hyprland/swayosd/swayosd-conf.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ ... }: { - services.swayosd.enable = true; -} \ No newline at end of file diff --git a/home-manager/common/desktops/hyprland/wlogout/wlogout-conf.nix b/home-manager/common/desktops/hyprland/wlogout/wlogout-conf.nix deleted file mode 100644 index a479b011..00000000 --- a/home-manager/common/desktops/hyprland/wlogout/wlogout-conf.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ ... }: { - xdg.configFile."wlogout/layout" = { - enable = true; - target = "./wlogout/layout"; - text = '' - { - "label" : "lock", - "action" : "swaylock", - "text" : "Lock", - "keybind" : "l" - } - { - "label" : "hibernate", - "action" : "systemctl hibernate", - "text" : "Hibernate", - "keybind" : "h" - } - { - "label" : "logout", - "action" : "loginctl terminate-user $USER", - "text" : "Logout", - "keybind" : "e" - } - { - "label" : "shutdown", - "action" : "systemctl poweroff", - "text" : "Shutdown", - "keybind" : "s" - } - { - "label" : "suspend", - "action" : "systemctl suspend", - "text" : "Suspend", - "keybind" : "u" - } - { - "label" : "reboot", - "action" : "systemctl reboot", - "text" : "Reboot", - "keybind" : "r" - } - ''; - }; -} \ No newline at end of file diff --git a/home-manager/common/desktops/xfce/default.nix b/home-manager/common/desktops/xfce/default.nix deleted file mode 100644 index e69de29b..00000000 diff --git a/home-manager/common/desktops/xfce/themes/default/default.nix b/home-manager/common/desktops/xfce/themes/default/default.nix deleted file mode 100644 index 30b31319..00000000 --- a/home-manager/common/desktops/xfce/themes/default/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix -{ - -} diff --git a/home-manager/common/desktops/xfce/themes/gruvbox/default.nix b/home-manager/common/desktops/xfce/themes/gruvbox/default.nix deleted file mode 100644 index 30b31319..00000000 --- a/home-manager/common/desktops/xfce/themes/gruvbox/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix -{ - -} diff --git a/home-manager/hosts/nixos-desktop/desktops/xfce/default.nix b/home-manager/hosts/nixos-desktop/desktops/xfce/default.nix deleted file mode 100644 index 077404aa..00000000 --- a/home-manager/hosts/nixos-desktop/desktops/xfce/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/home-manager/hosts/nixos-framework/desktops/xfce/default.nix b/home-manager/hosts/nixos-framework/desktops/xfce/default.nix deleted file mode 100644 index 077404aa..00000000 --- a/home-manager/hosts/nixos-framework/desktops/xfce/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/home-manager/hosts/nixos-iso-desktop/desktops/hyprland/default.nix b/home-manager/hosts/nixos-iso-desktop/desktops/hyprland/default.nix deleted file mode 100644 index e61a66bc..00000000 --- a/home-manager/hosts/nixos-iso-desktop/desktops/hyprland/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ theme, ... }: { - home.file = { - ".config/hypr/hyprland.conf" = { - enable = true; - text = '' - - # Monitor specific: - monitor=,2560x1440,auto,1 - $mainMod = SUPER - - # Start the config: - exec-once=bash ~/.config/hypr/start.sh - ''; - }; - # Set the custom launcher script - ".config/hypr/start.sh" = { - enable = true; - executable = true; - text = '' - #!/usr/bin/env bash - # https://wiki.hyprland.org/FAQ/#some-of-my-apps-take-a-really-long-time-to-open - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & - - # Set the wallpaper - swww init - - # Waybar - waybar & - - # Set up the idle management daemon - swayidle -w \ - timeout 120 'swaylock -f && playerctl pause' \ - timeout 180 'hyprctl dispatch dpms off' \ - timeout 300 'systemctl suspend-then-hibernate' \ - resume 'hyprctl dispatch dpms on' \ - before-sleep 'swaylock -f' \ - before-sleep 'playerctl pause' & - - # Automatic device mounting - udiskie & - - DIR=/etc/nixos/git/wallpapers/${theme} - IMG=`ls $DIR | shuf -n 1` - swww img $DIR/$IMG -t random & - - # Notification listener - mako - ''; - }; - }; -} diff --git a/home-manager/hosts/nixos-iso-desktop/desktops/xfce/default.nix b/home-manager/hosts/nixos-iso-desktop/desktops/xfce/default.nix deleted file mode 100644 index 077404aa..00000000 --- a/home-manager/hosts/nixos-iso-desktop/desktops/xfce/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/home-manager/small.nix b/home-manager/small.nix index ab8208e2..c2ff5e31 100644 --- a/home-manager/small.nix +++ b/home-manager/small.nix @@ -5,8 +5,7 @@ ./common/software/cli/git.nix ./common/software/cli/neovim.nix ./common/software/cli/ssh.nix - - ./common/software/cli/themes/${theme}/btop.nix + ./common/software/cli/btop.nix # User configs ./users/${username} diff --git a/lib/default.nix b/lib/default.nix index a7c329e6..0c285040 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -22,11 +22,11 @@ username ? "albert", desktop ? null, platform ? "x86_64-linux", - theme ? "default", + color ? "default", type ? "default" }: inputs.home-manager.lib.homeManagerConfiguration { pkgs = inputs.nixpkgs.legacyPackages.${platform}; - extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion theme; }; + extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion color; }; modules = [ ../home-manager/${type}.nix ]; @@ -39,10 +39,10 @@ desktop ? null, gpu ? null, platform ? "x86_64-linux", - theme ? "default", + color ? "default", type ? "default" }: inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme; }; + specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform color; }; modules = [ # Types are 'default', 'small', and 'minimal' ../nixos/${type}.nix @@ -58,10 +58,10 @@ desktop ? null, platform ? "x86_64-linux", gpu ? null, - theme ? "default", + color ? "default", format }: inputs.nixos-generators.nixosGenerate { - specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu platform theme format; }; + specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu platform color format; }; system = platform; format = format; @@ -71,7 +71,7 @@ inputs.sops-nix.nixosModules.sops inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.home-manager { - home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu platform theme format; }; + home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu platform color format; }; home-manager.users."${username}" = import ../home-manager; } ]; @@ -84,11 +84,11 @@ desktop ? null, platform ? "x86_64-linux", gpu ? null, - theme ? "default", + color ? "default", format }: inputs.nixos-generators.nixosGenerate { - specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu platform theme format; }; + specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu platform color format; }; system = platform; format = format; diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix index 50abee95..8759466a 100644 --- a/nixos/common/desktops/gnome/default.nix +++ b/nixos/common/desktops/gnome/default.nix @@ -83,15 +83,4 @@ gnome.gnome-session ]; - - imports = [ - # Gnome Themes - # ./themes/arc.nix - # ./themes/gruvbox.nix - # ./themes/tokyo-night.nix - # ./themes/nordic.nix - # ./themes/vimix.nix - # ./themes/fluent.nix - # You may need to edit which theme you're using in dconf.nix if you remove themes - ]; } diff --git a/nixos/common/desktops/gnome/themes/arc.nix b/nixos/common/desktops/gnome/themes/arc.nix deleted file mode 100644 index 140b72e0..00000000 --- a/nixos/common/desktops/gnome/themes/arc.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - arc-theme - ]; -} \ No newline at end of file diff --git a/nixos/common/desktops/gnome/themes/fluent.nix b/nixos/common/desktops/gnome/themes/fluent.nix deleted file mode 100644 index 689a8092..00000000 --- a/nixos/common/desktops/gnome/themes/fluent.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - fluent-gtk-theme - fluent-icon-theme - ]; -} \ No newline at end of file diff --git a/nixos/common/desktops/gnome/themes/gruvbox.nix b/nixos/common/desktops/gnome/themes/gruvbox.nix deleted file mode 100644 index b44a34c9..00000000 --- a/nixos/common/desktops/gnome/themes/gruvbox.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - gruvbox-gtk-theme - gruvbox-dark-icons-gtk - gruvbox-dark-gtk - ]; -} \ No newline at end of file diff --git a/nixos/common/desktops/gnome/themes/nordic.nix b/nixos/common/desktops/gnome/themes/nordic.nix deleted file mode 100644 index 04bfef9d..00000000 --- a/nixos/common/desktops/gnome/themes/nordic.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - nordic - nordzy-icon-theme - nordzy-cursor-theme - ]; -} \ No newline at end of file diff --git a/nixos/common/desktops/gnome/themes/tokyo-night.nix b/nixos/common/desktops/gnome/themes/tokyo-night.nix deleted file mode 100644 index 18bf31a5..00000000 --- a/nixos/common/desktops/gnome/themes/tokyo-night.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - tokyo-night-gtk - ]; -} \ No newline at end of file diff --git a/nixos/common/desktops/gnome/themes/vimix.nix b/nixos/common/desktops/gnome/themes/vimix.nix deleted file mode 100644 index 8e7c5bbb..00000000 --- a/nixos/common/desktops/gnome/themes/vimix.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - vimix-icon-theme - vimix-gtk-themes - ]; -} \ No newline at end of file diff --git a/nixos/common/desktops/hyprland/colors/stylix.nix b/nixos/common/desktops/hyprland/colors/stylix.nix new file mode 100644 index 00000000..d69f7f2a --- /dev/null +++ b/nixos/common/desktops/hyprland/colors/stylix.nix @@ -0,0 +1,7 @@ +{lib, inputs, pkgs, gpu, platform, color, ...}: { + stylix = { + image = /etc/nixos/git/wallpapers/${color}/wallpaper2.jpg; + polarity = "dark"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; + }; +} \ No newline at end of file diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix index 763c8953..4b378fe6 100644 --- a/nixos/common/desktops/hyprland/default.nix +++ b/nixos/common/desktops/hyprland/default.nix @@ -1,4 +1,4 @@ -{lib, inputs, pkgs, gpu, platform, ...}: { +{lib, inputs, pkgs, gpu, platform, color, ...}: { # nixpkgs = { # overlays = [ @@ -7,16 +7,16 @@ # ]; # }; - imports = [ inputs.stylix.nixosModules.stylix ]; + imports = [ + inputs.stylix.nixosModules.stylix + ./colors/${color}.nix; + ]; stylix = { - image = /etc/nixos/git/wallpapers/stylix/wallpaper2.jpg; targets = { plymouth.enable = false; }; autoEnable = true; - polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; fonts = { serif = { package = pkgs.dejavu_fonts; diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix deleted file mode 100644 index 4bc30c03..00000000 --- a/nixos/common/desktops/xfce/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, config, pkgs, hostname, gpu, ... }: { - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Configure keymap in X11 - services.xserver = { - enable = true; - layout = "us"; - xkbVariant = ""; - autorun = true; - videoDrivers = [ ] ++ lib.optional (builtins.isString gpu) gpu; - }; - - ##### disable nvidia, very nice battery life. - # hardware.nvidiaOptimus.disable = lib.mkDefault true; - - services.xserver = { - # https://nixos.org/manual/nixos/stable/index.html#chap-gnome - # Enable the GNOME Desktop Environment. - desktopManager = { - xterm.enable = false; - xfce.enable = true; - }; - displayManager.defaultSession = "xfce"; - }; - - environment.systemPackages = with pkgs; [ - # Gnome relevant packages - papirus-icon-theme - dconf2nix # https://github.com/gvolpe/dconf2nix - ]; -}