From 8d217624df7397f941ef8427a4bd4f82a8e14cdd Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 6 Jan 2024 21:47:19 +0900 Subject: [PATCH] Rename things --- flake.nix | 20 +++++++++---------- .../desktops/hyprland/colors/gruvbox.nix | 4 ++-- .../desktops/hyprland/colors/stylix.nix | 4 ++-- .../common/desktops/hyprland/default.nix | 4 ++-- home-manager/common/software/gui/firefox.nix | 2 +- home-manager/default.nix | 2 +- .../desktops/hyprland/default.nix | 4 ++-- home-manager/small.nix | 2 +- .../desktops/hyprland/colors/gruvbox.nix | 4 ++-- .../desktops/hyprland/colors/stylix.nix | 4 ++-- nixos/common/desktops/hyprland/default.nix | 4 ++-- nixos/default.nix | 2 +- nixos/minimal.nix | 2 +- nixos/small.nix | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index 448b86f6..9f792d89 100644 --- a/flake.nix +++ b/flake.nix @@ -52,21 +52,21 @@ osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; }; 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"; color = "gruvbox"; }; - 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"; }; + nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; desktop = "plasma6"; gpu = "nvidia"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd"; theme = "tokyo"; }; + 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"; }; }; homeConfigurations = { "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; }; "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"; color = "gruvbox"; }; - "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"; }; + "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "tokyo"; }; + "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"; }; }; deploy.nodes = { osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; }; @@ -79,7 +79,7 @@ # quitman-rpi4 = libx.deploy { hostname = "quitman-rpi4"; platform = "aarch64-linux"; }; }; imageConfigurations = { - nixos-linode-img = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; }; + nixos-linode-img = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; }; nixos-rpi4-img = libx.mkImage { hostname = "nixos-rpi4-img"; format = "sd-aarch64"; platform = "aarch64-linux"; }; nixos-iso-console = libx.mkImage { hostname = "nixos-iso-console"; format = "iso"; }; nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; }; diff --git a/home-manager/common/desktops/hyprland/colors/gruvbox.nix b/home-manager/common/desktops/hyprland/colors/gruvbox.nix index 61ee12fe..7e67b6ad 100644 --- a/home-manager/common/desktops/hyprland/colors/gruvbox.nix +++ b/home-manager/common/desktops/hyprland/colors/gruvbox.nix @@ -1,7 +1,7 @@ -{lib, inputs, pkgs, gpu, platform, color, ...}: { +{lib, inputs, pkgs, gpu, platform, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/wallpapers/${color}/wallpaper1.jpg; + image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.jpg; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; }; diff --git a/home-manager/common/desktops/hyprland/colors/stylix.nix b/home-manager/common/desktops/hyprland/colors/stylix.nix index a8384507..b70bb4dc 100644 --- a/home-manager/common/desktops/hyprland/colors/stylix.nix +++ b/home-manager/common/desktops/hyprland/colors/stylix.nix @@ -1,7 +1,7 @@ -{lib, inputs, pkgs, gpu, platform, color, ...}: { +{lib, inputs, pkgs, gpu, platform, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/wallpapers/${color}/wallpaper1.jpg; + image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.jpg; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; }; diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix index 30ece469..245efed5 100644 --- a/home-manager/common/desktops/hyprland/default.nix +++ b/home-manager/common/desktops/hyprland/default.nix @@ -1,7 +1,7 @@ -{ pkgs, inputs, color, ... }: { +{ pkgs, inputs, theme, ... }: { imports = [ inputs.stylix.homeManagerModules.stylix - ./colors/${color}.nix + ./themes/${theme}.nix ./components ./assets/waybar/scripts.nix ]; diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix index 54a13c91..e98b1dde 100644 --- a/home-manager/common/software/gui/firefox.nix +++ b/home-manager/common/software/gui/firefox.nix @@ -1,4 +1,4 @@ -{ inputs, config, pkgs, color, ... }: { +{ inputs, config, pkgs, theme, ... }: { # home.file.".mozilla/firefox/nix-user-profile/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme; diff --git a/home-manager/default.nix b/home-manager/default.nix index 5a465843..59a9f14e 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, inputs, hostname, platform, username, desktop, color, hmStateVersion, ... }: { +{ lib, config, pkgs, inputs, hostname, platform, username, desktop, theme, hmStateVersion, ... }: { imports = [ # Doom-Emacs input import inputs.doom-emacs.hmModule diff --git a/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix b/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix index 4c38f6ba..464a771f 100644 --- a/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix +++ b/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix @@ -1,4 +1,4 @@ -{ color, ... }: { +{ theme, ... }: { wayland.windowManager.hyprland = { settings = { monitor = ",highrr,auto,1.25"; @@ -49,7 +49,7 @@ # Automatic device mounting udiskie & - DIR=/etc/nixos/git/wallpapers/${color} + DIR=/etc/nixos/git/wallpapers/${theme} IMG=`ls $DIR | shuf -n 1` swww img $DIR/$IMG -t random & diff --git a/home-manager/small.nix b/home-manager/small.nix index fd28845b..c2ff5e31 100644 --- a/home-manager/small.nix +++ b/home-manager/small.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, inputs, hostname, platform, username, desktop, color, hmStateVersion, ... }: { +{ lib, config, pkgs, inputs, hostname, platform, username, desktop, theme, hmStateVersion, ... }: { imports = [ # Common configs ./common/software/cli/bash.nix diff --git a/nixos/common/desktops/hyprland/colors/gruvbox.nix b/nixos/common/desktops/hyprland/colors/gruvbox.nix index 61ee12fe..7e67b6ad 100644 --- a/nixos/common/desktops/hyprland/colors/gruvbox.nix +++ b/nixos/common/desktops/hyprland/colors/gruvbox.nix @@ -1,7 +1,7 @@ -{lib, inputs, pkgs, gpu, platform, color, ...}: { +{lib, inputs, pkgs, gpu, platform, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/wallpapers/${color}/wallpaper1.jpg; + image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.jpg; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; }; diff --git a/nixos/common/desktops/hyprland/colors/stylix.nix b/nixos/common/desktops/hyprland/colors/stylix.nix index a8384507..b70bb4dc 100644 --- a/nixos/common/desktops/hyprland/colors/stylix.nix +++ b/nixos/common/desktops/hyprland/colors/stylix.nix @@ -1,7 +1,7 @@ -{lib, inputs, pkgs, gpu, platform, color, ...}: { +{lib, inputs, pkgs, gpu, platform, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/wallpapers/${color}/wallpaper1.jpg; + image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.jpg; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; }; diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix index e104bf97..01f7e98e 100644 --- a/nixos/common/desktops/hyprland/default.nix +++ b/nixos/common/desktops/hyprland/default.nix @@ -1,4 +1,4 @@ -{lib, inputs, pkgs, gpu, platform, color, ...}: { +{lib, inputs, pkgs, gpu, platform, theme, ...}: { # nixpkgs = { # overlays = [ @@ -9,7 +9,7 @@ imports = [ inputs.stylix.nixosModules.stylix - ./colors/${color}.nix + ./themes/${theme}.nix ]; stylix = { diff --git a/nixos/default.nix b/nixos/default.nix index c9fe937c..1193c6c9 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, color, ... }: { +{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, theme, ... }: { imports = [ # Modules inputs.disko.nixosModules.disko diff --git a/nixos/minimal.nix b/nixos/minimal.nix index ede6e44c..f722a232 100644 --- a/nixos/minimal.nix +++ b/nixos/minimal.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, color, ... }: { +{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, theme, ... }: { imports = [ # Services ./common/services/openssh.nix diff --git a/nixos/small.nix b/nixos/small.nix index 64d27adb..8897e402 100644 --- a/nixos/small.nix +++ b/nixos/small.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, color, ... }: { +{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, theme, ... }: { imports = [ # Modules inputs.disko.nixosModules.disko