changed naming
This commit is contained in:
+31
-31
@@ -3,11 +3,11 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.omarchy;
|
||||
cfg = config.omnixy;
|
||||
in
|
||||
{
|
||||
options.omarchy = {
|
||||
enable = mkEnableOption "Omarchy system configuration";
|
||||
options.omnixy = {
|
||||
enable = mkEnableOption "OmniXY system configuration";
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
@@ -33,7 +33,7 @@ in
|
||||
# Basic system configuration
|
||||
system.autoUpgrade = {
|
||||
enable = true;
|
||||
flake = "/etc/nixos#omarchy";
|
||||
flake = "/etc/nixos#omnixy";
|
||||
flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
|
||||
dates = "weekly";
|
||||
};
|
||||
@@ -178,15 +178,15 @@ in
|
||||
GOPATH = "$HOME/go";
|
||||
NPM_CONFIG_PREFIX = "$HOME/.npm";
|
||||
|
||||
# Omarchy specific
|
||||
OMARCHY_ROOT = "/etc/nixos";
|
||||
OMARCHY_VERSION = "1.0.0";
|
||||
# OmniXY specific
|
||||
OMNIXY_ROOT = "/etc/nixos";
|
||||
OMNIXY_VERSION = "1.0.0";
|
||||
};
|
||||
|
||||
# Shell configuration
|
||||
programs.bash = {
|
||||
interactiveShellInit = ''
|
||||
# Omarchy bash initialization
|
||||
# OmniXY bash initialization
|
||||
export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/go/bin:$HOME/.npm/bin:$PATH"
|
||||
|
||||
# Aliases
|
||||
@@ -198,14 +198,14 @@ in
|
||||
alias vim='nvim'
|
||||
alias vi='nvim'
|
||||
|
||||
# Omarchy specific aliases
|
||||
alias omarchy-rebuild='sudo nixos-rebuild switch --flake /etc/nixos#omarchy'
|
||||
alias omarchy-update='nix flake update --flake /etc/nixos'
|
||||
alias omarchy-clean='sudo nix-collect-garbage -d'
|
||||
alias omarchy-search='nix search nixpkgs'
|
||||
# OmniXY specific aliases
|
||||
alias omnixy-rebuild='sudo nixos-rebuild switch --flake /etc/nixos#omnixy'
|
||||
alias omnixy-update='nix flake update --flake /etc/nixos'
|
||||
alias omnixy-clean='sudo nix-collect-garbage -d'
|
||||
alias omnixy-search='nix search nixpkgs'
|
||||
|
||||
# Functions
|
||||
omarchy-theme() {
|
||||
omnixy-theme() {
|
||||
local theme=$1
|
||||
if [ -z "$theme" ]; then
|
||||
echo "Available themes: tokyo-night, catppuccin, gruvbox, nord, everforest, rose-pine, kanagawa"
|
||||
@@ -215,19 +215,19 @@ in
|
||||
echo "Switching to theme: $theme"
|
||||
# This would need to update the configuration and rebuild
|
||||
sudo sed -i "s/currentTheme = \".*\"/currentTheme = \"$theme\"/" /etc/nixos/configuration.nix
|
||||
omarchy-rebuild
|
||||
omnixy-rebuild
|
||||
}
|
||||
|
||||
omarchy-help() {
|
||||
omnixy-help() {
|
||||
cat << EOF
|
||||
Omarchy Commands:
|
||||
================
|
||||
omarchy-rebuild - Rebuild system configuration
|
||||
omarchy-update - Update flake inputs
|
||||
omarchy-clean - Garbage collect nix store
|
||||
omarchy-search - Search for packages
|
||||
omarchy-theme - Change system theme
|
||||
omarchy-help - Show this help message
|
||||
OmniXY Commands:
|
||||
===============
|
||||
omnixy-rebuild - Rebuild system configuration
|
||||
omnixy-update - Update flake inputs
|
||||
omnixy-clean - Garbage collect nix store
|
||||
omnixy-search - Search for packages
|
||||
omnixy-theme - Change system theme
|
||||
omnixy-help - Show this help message
|
||||
|
||||
Key Bindings (Hyprland):
|
||||
=======================
|
||||
@@ -239,13 +239,13 @@ in
|
||||
Super + F - Fullscreen
|
||||
Super + Space - Toggle floating
|
||||
|
||||
For more information, visit: https://omarchy.org
|
||||
For more information, visit: https://github.com/TheArctesian/omnixy
|
||||
EOF
|
||||
}
|
||||
|
||||
# Welcome message
|
||||
if [ -z "$IN_NIX_SHELL" ]; then
|
||||
echo "Welcome to Omarchy! Type 'omarchy-help' for available commands."
|
||||
echo "Welcome to OmniXY! Type 'omnixy-help' for available commands."
|
||||
fi
|
||||
'';
|
||||
|
||||
@@ -287,12 +287,12 @@ in
|
||||
nixpkgs-fmt
|
||||
nil
|
||||
|
||||
# Custom Omarchy scripts
|
||||
(writeShellScriptBin "omarchy-info" ''
|
||||
# Custom OmniXY scripts
|
||||
(writeShellScriptBin "omnixy-info" ''
|
||||
#!/usr/bin/env bash
|
||||
echo "Omarchy NixOS"
|
||||
echo "============="
|
||||
echo "Version: ${config.omarchy.version or "1.0.0"}"
|
||||
echo "OmniXY NixOS"
|
||||
echo "============"
|
||||
echo "Version: ${config.omnixy.version or "1.0.0"}"
|
||||
echo "Theme: ${cfg.theme}"
|
||||
echo "User: ${cfg.user}"
|
||||
echo ""
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.omarchy.desktop;
|
||||
cfg = config.omnixy.desktop;
|
||||
in
|
||||
{
|
||||
options.omarchy.desktop = {
|
||||
enable = mkEnableOption "Omarchy Hyprland desktop environment";
|
||||
options.omnixy.desktop = {
|
||||
enable = mkEnableOption "OmniXY Hyprland desktop environment";
|
||||
|
||||
monitors = mkOption {
|
||||
type = types.listOf types.str;
|
||||
@@ -139,10 +139,10 @@ in
|
||||
|
||||
# Create Hyprland config directory structure
|
||||
system.activationScripts.hyprlandConfig = ''
|
||||
mkdir -p /etc/omarchy/hyprland
|
||||
mkdir -p /etc/omnixy/hyprland
|
||||
|
||||
# Main Hyprland configuration
|
||||
cat > /etc/omarchy/hyprland/hyprland.conf <<'EOF'
|
||||
cat > /etc/omnixy/hyprland/hyprland.conf <<'EOF'
|
||||
# Omarchy Hyprland Configuration
|
||||
# See https://wiki.hyprland.org/Configuring/
|
||||
|
||||
@@ -387,7 +387,7 @@ in
|
||||
'';
|
||||
|
||||
# Waybar configuration
|
||||
home-manager.users.${config.omarchy.user or "user"} = {
|
||||
home-manager.users.${config.omnixy.user or "user"} = {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.omarchy.features.development;
|
||||
cfg = config.omnixy.features.development;
|
||||
in
|
||||
{
|
||||
config = mkIf cfg {
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.omarchy;
|
||||
cfg = config.omnixy;
|
||||
in
|
||||
{
|
||||
options.omarchy.packages = {
|
||||
enable = mkEnableOption "Omarchy packages";
|
||||
options.omnixy.packages = {
|
||||
enable = mkEnableOption "OmniXY packages";
|
||||
|
||||
categories = {
|
||||
base = mkEnableOption "Base system packages" // { default = true; };
|
||||
|
||||
+10
-10
@@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.omarchy;
|
||||
cfg = config.omnixy;
|
||||
in
|
||||
{
|
||||
# System services configuration
|
||||
@@ -218,7 +218,7 @@ in
|
||||
# enable = true;
|
||||
# allowReboot = false;
|
||||
# dates = "04:00";
|
||||
# flake = "/etc/nixos#omarchy";
|
||||
# flake = "/etc/nixos#omnixy";
|
||||
# };
|
||||
|
||||
# Earlyoom - out of memory killer
|
||||
@@ -232,7 +232,7 @@ in
|
||||
logrotate = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"/var/log/omarchy/*.log" = {
|
||||
"/var/log/omnixy/*.log" = {
|
||||
frequency = "weekly";
|
||||
rotate = 4;
|
||||
compress = true;
|
||||
@@ -270,25 +270,25 @@ in
|
||||
};
|
||||
|
||||
# Custom Omarchy services
|
||||
services.omarchy-init = {
|
||||
services.omnixy-init = {
|
||||
description = "Omarchy initialization service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = pkgs.writeShellScript "omarchy-init" ''
|
||||
ExecStart = pkgs.writeShellScript "omnixy-init" ''
|
||||
#!/usr/bin/env bash
|
||||
echo "Initializing Omarchy..."
|
||||
|
||||
# Create necessary directories
|
||||
mkdir -p /var/log/omarchy
|
||||
mkdir -p /var/lib/omarchy
|
||||
mkdir -p /etc/omarchy
|
||||
mkdir -p /var/log/omnixy
|
||||
mkdir -p /var/lib/omnixy
|
||||
mkdir -p /etc/omnixy
|
||||
|
||||
# Set up initial configuration
|
||||
if [ ! -f /etc/omarchy/initialized ]; then
|
||||
echo "$(date): Omarchy initialized" > /etc/omarchy/initialized
|
||||
if [ ! -f /etc/omnixy/initialized ]; then
|
||||
echo "$(date): OmniXY initialized" > /etc/omnixy/initialized
|
||||
echo "Welcome to Omarchy!" > /etc/motd
|
||||
fi
|
||||
'';
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
config = {
|
||||
# Color palette
|
||||
environment.variables = {
|
||||
OMARCHY_THEME = "catppuccin";
|
||||
OMARCHY_THEME_BG = "#1e1e2e";
|
||||
OMARCHY_THEME_FG = "#cdd6f4";
|
||||
OMARCHY_THEME_ACCENT = "#cba6f7";
|
||||
OMNIXY_THEME = "catppuccin";
|
||||
OMNIXY_THEME_BG = "#1e1e2e";
|
||||
OMNIXY_THEME_FG = "#cdd6f4";
|
||||
OMNIXY_THEME_ACCENT = "#cba6f7";
|
||||
};
|
||||
|
||||
# Home-manager theme configuration
|
||||
home-manager.users.${config.omarchy.user or "user"} = {
|
||||
home-manager.users.${config.omnixy.user or "user"} = {
|
||||
# Alacritty theme
|
||||
programs.alacritty.settings.colors = {
|
||||
primary = {
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
config = {
|
||||
# Color palette
|
||||
environment.variables = {
|
||||
OMARCHY_THEME = "tokyo-night";
|
||||
OMARCHY_THEME_BG = "#1a1b26";
|
||||
OMARCHY_THEME_FG = "#c0caf5";
|
||||
OMARCHY_THEME_ACCENT = "#7aa2f7";
|
||||
OMNIXY_THEME = "tokyo-night";
|
||||
OMNIXY_THEME_BG = "#1a1b26";
|
||||
OMNIXY_THEME_FG = "#c0caf5";
|
||||
OMNIXY_THEME_ACCENT = "#7aa2f7";
|
||||
};
|
||||
|
||||
# Home-manager theme configuration
|
||||
home-manager.users.${config.omarchy.user or "user"} = {
|
||||
home-manager.users.${config.omnixy.user or "user"} = {
|
||||
# Alacritty theme
|
||||
programs.alacritty.settings.colors = {
|
||||
primary = {
|
||||
|
||||
+3
-3
@@ -3,13 +3,13 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.omarchy;
|
||||
cfg = config.omnixy;
|
||||
in
|
||||
{
|
||||
# User account configuration
|
||||
users.users.${cfg.user} = {
|
||||
isNormalUser = true;
|
||||
description = "Omarchy User";
|
||||
description = "OmniXY User";
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
@@ -23,7 +23,7 @@ in
|
||||
shell = pkgs.bash;
|
||||
|
||||
# Set initial password (should be changed on first login)
|
||||
initialPassword = "omarchy";
|
||||
initialPassword = "omnixy";
|
||||
|
||||
# SSH keys (add your SSH public keys here)
|
||||
openssh.authorizedKeys.keys = [
|
||||
|
||||
Reference in New Issue
Block a user