From ef52fda7052a4cecee815a0b3f64b8988ab4e7e9 Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Thu, 5 Sep 2024 13:17:05 -0400 Subject: [PATCH] restructured file tree --- .gitignore | 2 +- flake.nix | 8 +- home-manager/{home.nix => default.nix} | 25 +-- home-manager/fastfetch.nix | 84 -------- home-manager/fish.nix | 204 ------------------ .../{ => modules/fastfetch}/cloud.png | Bin .../{ => modules/fastfetch}/cloud.txt | 0 home-manager/modules/fastfetch/default.nix | 84 ++++++++ home-manager/modules/fish/default.nix | 12 ++ home-manager/modules/fish/init.fish | 192 +++++++++++++++++ nixos/{configuration.nix => default.nix} | 17 +- nixos/modules/acme/default.nix | 10 + .../nextcloud/default.nix} | 0 .../nginx.nix => modules/nginx/default.nix} | 7 - .../snapraid/default.nix} | 0 .../snapraid}/snapraid.conf | 0 16 files changed, 327 insertions(+), 318 deletions(-) rename home-manager/{home.nix => default.nix} (63%) delete mode 100644 home-manager/fastfetch.nix delete mode 100644 home-manager/fish.nix rename home-manager/{ => modules/fastfetch}/cloud.png (100%) rename home-manager/{ => modules/fastfetch}/cloud.txt (100%) create mode 100644 home-manager/modules/fastfetch/default.nix create mode 100644 home-manager/modules/fish/default.nix create mode 100644 home-manager/modules/fish/init.fish rename nixos/{configuration.nix => default.nix} (96%) create mode 100644 nixos/modules/acme/default.nix rename nixos/{imports/nextcloud.nix => modules/nextcloud/default.nix} (100%) rename nixos/{imports/nginx.nix => modules/nginx/default.nix} (76%) rename nixos/{imports/snapraid.nix => modules/snapraid/default.nix} (100%) rename nixos/{imports => modules/snapraid}/snapraid.conf (100%) diff --git a/.gitignore b/.gitignore index 2ed863c..b089446 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -nixos/imports/nextcloud-admin-pass +nixos/modules/nextcloud/nextcloud-admin-pass diff --git a/flake.nix b/flake.nix index f73fab3..b2d7777 100644 --- a/flake.nix +++ b/flake.nix @@ -21,14 +21,16 @@ nixosConfigurations = { cloud = lib.nixosSystem { inherit system; - modules = [ ./nixos/configuration.nix ]; + modules = [ + ./nixos + ]; }; }; homeConfigurations = { toph = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./home-manager/home.nix ]; + modules = [ ./home-manager ]; }; }; }; -} +} \ No newline at end of file diff --git a/home-manager/home.nix b/home-manager/default.nix similarity index 63% rename from home-manager/home.nix rename to home-manager/default.nix index eb7f069..87828d5 100644 --- a/home-manager/home.nix +++ b/home-manager/default.nix @@ -1,6 +1,11 @@ { pkgs, ... }: - { + # Module imports + imports = [ + ./modules/fastfetch + ./modules/fish + ]; + home = { username = "toph"; homeDirectory = "/home/toph"; @@ -14,23 +19,19 @@ grc ]; - file = { - # ".config" = { - # recursive = true; - # source = ../.config; - # }; - }; + # file = { + # ".config" = { + # recursive = true; + # source = ../.config; + # }; + # }; sessionVariables = { EDITOR = "micro"; VISUAL = "micro"; XDG_CONFIG_HOME = "$HOME/.config"; }; - }; - - # Programs and Services - programs.fish = import ./fish.nix { inherit pkgs; }; - programs.fastfetch = import ./fastfetch.nix { inherit pkgs; }; + }; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/home-manager/fastfetch.nix b/home-manager/fastfetch.nix deleted file mode 100644 index 5d75976..0000000 --- a/home-manager/fastfetch.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ pkgs, ... }: -# progams./fastfetch = -{ - enable = true; - settings = { - logo = { - # Created with Chafa - # chafa -s 26x13 -w 9 --symbols vhalf --view-size 26x13 cloud.png > cloud.txt - source = builtins.readFile ./cloud.txt; - type = "data"; - position = "left"; - padding = { - top = 0; - }; - }; - display = { - separator = " "; - }; - modules = [ - { - key = "╭───────────╮"; - type = "custom"; - } - { - key = "│ {#31} user {#keys}│"; - type = "title"; - format = "{user-name}"; - } - { - key = "│ {#32}󰇅 host {#keys}│"; - type = "title"; - format = "{host-name}"; - } - { - key = "│ {#33}󰅐 uptime {#keys}│"; - type = "uptime"; - } - { - key = "│ {#34}{icon} distro {#keys}│"; - type = "os"; - } - { - key = "│ {#36}󰇄 desktop {#keys}│"; - type = "de"; - } - { - key = "│ {#32} shell {#keys}│"; - type = "shell"; - } - { - key = "│ {#33}󰍛 cpu {#keys}│"; - type = "cpu"; - showPeCoreCount = true; - } - { - key = "│ {#34}󰉉 disk {#keys}│"; - type = "disk"; - folders = "/"; - } - { - key = "│ {#35} memory {#keys}│"; - type = "memory"; - } - { - key = "│ {#36}󰩟 network {#keys}│"; - type = "localip"; - format = "{ipv4} ({ifname})"; - } - { - key = "├───────────┤"; - type = "custom"; - } - { - key = "│ {#39} colors {#keys}│"; - type = "colors"; - symbol = "circle"; - } - { - key = "╰───────────╯"; - type = "custom"; - } - ]; - }; -} \ No newline at end of file diff --git a/home-manager/fish.nix b/home-manager/fish.nix deleted file mode 100644 index 2621e45..0000000 --- a/home-manager/fish.nix +++ /dev/null @@ -1,204 +0,0 @@ -{ pkgs, ... }: -# progams.fish = -{ - enable = true; - interactiveShellInit = '' - set -U __fish_initialized 3400 - set -U _tide_left_items pwd\x1egit\x1enewline\x1echaracter - set -U _tide_prompt_92037 \x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x40PWD\x40\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x20\x1e\x1b\x5b38\x3b5\x3b76m\u276f\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b180mtoph\x40nix\x1b\x5b38\x3b5\x3b246m\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b66m11\x3a43\x3a49\x20PM\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm - set -U _tide_right_items status\x1ecmd_duration\x1econtext\x1ejobs\x1enix_shell\x1etime - set -U fish_color_autosuggestion brblack - set -U fish_color_cancel \x2dr - set -U fish_color_command blue - set -U fish_color_comment red - set -U fish_color_cwd green - set -U fish_color_cwd_root red - set -U fish_color_end green - set -U fish_color_error brred - set -U fish_color_escape brcyan - set -U fish_color_history_current \x2d\x2dbold - set -U fish_color_host normal - set -U fish_color_host_remote yellow - set -U fish_color_normal normal - set -U fish_color_operator brcyan - set -U fish_color_param cyan - set -U fish_color_quote yellow - set -U fish_color_redirection cyan\x1e\x2d\x2dbold - set -U fish_color_search_match bryellow\x1e\x2d\x2dbackground\x3dbrblack - set -U fish_color_selection white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack - set -U fish_color_status red - set -U fish_color_user brgreen - set -U fish_color_valid_path \x2d\x2dunderline - set -U fish_key_bindings fish_default_key_bindings - set -U fish_pager_color_completion normal - set -U fish_pager_color_description yellow\x1e\x2di - set -U fish_pager_color_prefix normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline - set -U fish_pager_color_progress brwhite\x1e\x2d\x2dbackground\x3dcyan - set -U fish_pager_color_selected_background \x2dr - set -U tide_aws_bg_color normal - set -U tide_aws_color FF9900 - set -U tide_aws_icon \uf270 - set -U tide_character_color 5FD700 - set -U tide_character_color_failure FF0000 - set -U tide_character_icon \u276f - set -U tide_character_vi_icon_default \u276e - set -U tide_character_vi_icon_replace \u25b6 - set -U tide_character_vi_icon_visual V - set -U tide_cmd_duration_bg_color normal - set -U tide_cmd_duration_color 87875F - set -U tide_cmd_duration_decimals 0 - set -U tide_cmd_duration_icon \x1d - set -U tide_cmd_duration_threshold 3000 - set -U tide_context_always_display false - set -U tide_context_bg_color normal - set -U tide_context_color_default D7AF87 - set -U tide_context_color_root D7AF00 - set -U tide_context_color_ssh D7AF87 - set -U tide_context_hostname_parts 1 - set -U tide_crystal_bg_color normal - set -U tide_crystal_color FFFFFF - set -U tide_crystal_icon \ue62f - set -U tide_direnv_bg_color normal - set -U tide_direnv_bg_color_denied normal - set -U tide_direnv_color D7AF00 - set -U tide_direnv_color_denied FF0000 - set -U tide_direnv_icon \u25bc - set -U tide_distrobox_bg_color normal - set -U tide_distrobox_color FF00FF - set -U tide_distrobox_icon \U000f01a7 - set -U tide_docker_bg_color normal - set -U tide_docker_color 2496ED - set -U tide_docker_default_contexts default\x1ecolima - set -U tide_docker_icon \uf308 - set -U tide_elixir_bg_color normal - set -U tide_elixir_color 4E2A8E - set -U tide_elixir_icon \ue62d - set -U tide_gcloud_bg_color normal - set -U tide_gcloud_color 4285F4 - set -U tide_gcloud_icon \U000f02ad - set -U tide_git_bg_color normal - set -U tide_git_bg_color_unstable normal - set -U tide_git_bg_color_urgent normal - set -U tide_git_color_branch 5FD700 - set -U tide_git_color_conflicted FF0000 - set -U tide_git_color_dirty D7AF00 - set -U tide_git_color_operation FF0000 - set -U tide_git_color_staged D7AF00 - set -U tide_git_color_stash 5FD700 - set -U tide_git_color_untracked 00AFFF - set -U tide_git_color_upstream 5FD700 - set -U tide_git_icon \x1d - set -U tide_git_truncation_length 24 - set -U tide_git_truncation_strategy \x1d - set -U tide_go_bg_color normal - set -U tide_go_color 00ACD7 - set -U tide_go_icon \ue627 - set -U tide_java_bg_color normal - set -U tide_java_color ED8B00 - set -U tide_java_icon \ue256 - set -U tide_jobs_bg_color normal - set -U tide_jobs_color 5FAF00 - set -U tide_jobs_icon \uf013 - set -U tide_jobs_number_threshold 1000 - set -U tide_kubectl_bg_color normal - set -U tide_kubectl_color 326CE5 - set -U tide_kubectl_icon \U000f10fe - set -U tide_left_prompt_frame_enabled false - set -U tide_left_prompt_items pwd\x1egit\x1enewline\x1echaracter - set -U tide_left_prompt_prefix - set -U tide_left_prompt_separator_diff_color \x20 - set -U tide_left_prompt_separator_same_color \x20 - set -U tide_left_prompt_suffix \x20 - set -U tide_nix_shell_bg_color normal - set -U tide_nix_shell_color 7EBAE4 - set -U tide_nix_shell_icon \uf313 - set -U tide_node_bg_color normal - set -U tide_node_color 44883E - set -U tide_node_icon \ue24f - set -U tide_os_bg_color normal - set -U tide_os_color normal - set -U tide_os_icon \uf313 - set -U tide_php_bg_color normal - set -U tide_php_color 617CBE - set -U tide_php_icon \ue608 - set -U tide_private_mode_bg_color normal - set -U tide_private_mode_color FFFFFF - set -U tide_private_mode_icon \U000f05f9 - set -U tide_prompt_add_newline_before false - set -U tide_prompt_color_frame_and_connection 585858 - set -U tide_prompt_color_separator_same_color 949494 - set -U tide_prompt_icon_connection \u00b7 - set -U tide_prompt_min_cols 34 - set -U tide_prompt_pad_items false - set -U tide_prompt_transient_enabled true - set -U tide_pulumi_bg_color normal - set -U tide_pulumi_color F7BF2A - set -U tide_pulumi_icon \uf1b2 - set -U tide_pwd_bg_color normal - set -U tide_pwd_color_anchors 00AFFF - set -U tide_pwd_color_dirs 0087AF - set -U tide_pwd_color_truncated_dirs 8787AF - set -U tide_pwd_icon \x1d - set -U tide_pwd_icon_home \x1d - set -U tide_pwd_icon_unwritable \uf023 - set -U tide_pwd_markers \x2ebzr\x1e\x2ecitc\x1e\x2egit\x1e\x2ehg\x1e\x2enode\x2dversion\x1e\x2epython\x2dversion\x1e\x2eruby\x2dversion\x1e\x2eshorten_folder_marker\x1e\x2esvn\x1e\x2eterraform\x1eCargo\x2etoml\x1ecomposer\x2ejson\x1eCVS\x1ego\x2emod\x1epackage\x2ejson\x1ebuild\x2ezig - set -U tide_python_bg_color normal - set -U tide_python_color 00AFAF - set -U tide_python_icon \U000f0320 - set -U tide_right_prompt_frame_enabled false - set -U tide_right_prompt_items status\x1ecmd_duration\x1econtext\x1ejobs\x1edirenv\x1enode\x1epython\x1erustc\x1ejava\x1ephp\x1epulumi\x1eruby\x1ego\x1egcloud\x1ekubectl\x1edistrobox\x1etoolbox\x1eterraform\x1eaws\x1enix_shell\x1ecrystal\x1eelixir\x1ezig\x1etime - set -U tide_right_prompt_prefix \x20 - set -U tide_right_prompt_separator_diff_color \x20 - set -U tide_right_prompt_separator_same_color \x20 - set -U tide_right_prompt_suffix - set -U tide_ruby_bg_color normal - set -U tide_ruby_color B31209 - set -U tide_ruby_icon \ue23e - set -U tide_rustc_bg_color normal - set -U tide_rustc_color F74C00 - set -U tide_rustc_icon \ue7a8 - set -U tide_shlvl_bg_color normal - set -U tide_shlvl_color d78700 - set -U tide_shlvl_icon \uf120 - set -U tide_shlvl_threshold 1 - set -U tide_status_bg_color normal - set -U tide_status_bg_color_failure normal - set -U tide_status_color 5FAF00 - set -U tide_status_color_failure D70000 - set -U tide_status_icon \u2714 - set -U tide_status_icon_failure \u2718 - set -U tide_terraform_bg_color normal - set -U tide_terraform_color 844FBA - set -U tide_terraform_icon \U000f1062 - set -U tide_time_bg_color normal - set -U tide_time_color 5F8787 - set -U tide_time_format \x25r - set -U tide_toolbox_bg_color normal - set -U tide_toolbox_color 613583 - set -U tide_toolbox_icon \ue24f - set -U tide_vi_mode_bg_color_default normal - set -U tide_vi_mode_bg_color_insert normal - set -U tide_vi_mode_bg_color_replace normal - set -U tide_vi_mode_bg_color_visual normal - set -U tide_vi_mode_color_default 949494 - set -U tide_vi_mode_color_insert 87AFAF - set -U tide_vi_mode_color_replace 87AF87 - set -U tide_vi_mode_color_visual FF8700 - set -U tide_vi_mode_icon_default D - set -U tide_vi_mode_icon_insert I - set -U tide_vi_mode_icon_replace R - set -U tide_vi_mode_icon_visual V - set -U tide_zig_bg_color normal - set -U tide_zig_color F7A41D - set -U tide_zig_icon \ue6a9 - - set fish_greeting # Disable greeting - - fastfetch - ''; - plugins = [ - # Enable a plugin (here grc for colorized command output) from nixpkgs - { name = "grc"; src = pkgs.fishPlugins.grc.src; } - { name = "tide"; src = pkgs.fishPlugins.tide.src; } - ]; -} diff --git a/home-manager/cloud.png b/home-manager/modules/fastfetch/cloud.png similarity index 100% rename from home-manager/cloud.png rename to home-manager/modules/fastfetch/cloud.png diff --git a/home-manager/cloud.txt b/home-manager/modules/fastfetch/cloud.txt similarity index 100% rename from home-manager/cloud.txt rename to home-manager/modules/fastfetch/cloud.txt diff --git a/home-manager/modules/fastfetch/default.nix b/home-manager/modules/fastfetch/default.nix new file mode 100644 index 0000000..30d7176 --- /dev/null +++ b/home-manager/modules/fastfetch/default.nix @@ -0,0 +1,84 @@ +{ + programs.fastfetch = { + enable = true; + settings = { + logo = { + # Created with Chafa + # chafa -s 26x13 -w 9 --symbols vhalf --view-size 26x13 cloud.png > cloud.txt + source = builtins.readFile ./cloud.txt; + type = "data"; + position = "left"; + padding = { + top = 0; + }; + }; + display = { + separator = " "; + }; + modules = [ + { + key = "╭───────────╮"; + type = "custom"; + } + { + key = "│ {#31} user {#keys}│"; + type = "title"; + format = "{user-name}"; + } + { + key = "│ {#32}󰇅 host {#keys}│"; + type = "title"; + format = "{host-name}"; + } + { + key = "│ {#33}󰅐 uptime {#keys}│"; + type = "uptime"; + } + { + key = "│ {#34}{icon} distro {#keys}│"; + type = "os"; + } + { + key = "│ {#36}󰇄 desktop {#keys}│"; + type = "de"; + } + { + key = "│ {#32} shell {#keys}│"; + type = "shell"; + } + { + key = "│ {#33}󰍛 cpu {#keys}│"; + type = "cpu"; + showPeCoreCount = true; + } + { + key = "│ {#34}󰉉 disk {#keys}│"; + type = "disk"; + folders = "/"; + } + { + key = "│ {#35} memory {#keys}│"; + type = "memory"; + } + { + key = "│ {#36}󰩟 network {#keys}│"; + type = "localip"; + format = "{ipv4} ({ifname})"; + } + { + key = "├───────────┤"; + type = "custom"; + } + { + key = "│ {#39} colors {#keys}│"; + type = "colors"; + symbol = "circle"; + } + { + key = "╰───────────╯"; + type = "custom"; + } + ]; + }; + }; +} \ No newline at end of file diff --git a/home-manager/modules/fish/default.nix b/home-manager/modules/fish/default.nix new file mode 100644 index 0000000..1d67b4e --- /dev/null +++ b/home-manager/modules/fish/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + programs.fish = { + enable = true; + interactiveShellInit = builtins.readFile ./init.fish; + plugins = [ + # Enable a plugin (here grc for colorized command output) from nixpkgs + { name = "grc"; src = pkgs.fishPlugins.grc.src; } + { name = "tide"; src = pkgs.fishPlugins.tide.src; } + ]; + }; +} diff --git a/home-manager/modules/fish/init.fish b/home-manager/modules/fish/init.fish new file mode 100644 index 0000000..4b70cfa --- /dev/null +++ b/home-manager/modules/fish/init.fish @@ -0,0 +1,192 @@ +set -U __fish_initialized 3400 +set -U _tide_left_items pwd\x1egit\x1enewline\x1echaracter +set -U _tide_prompt_92037 \x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x40PWD\x40\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x20\x1e\x1b\x5b38\x3b5\x3b76m\u276f\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b180mtoph\x40nix\x1b\x5b38\x3b5\x3b246m\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b5\x3b66m11\x3a43\x3a49\x20PM\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm +set -U _tide_right_items status\x1ecmd_duration\x1econtext\x1ejobs\x1enix_shell\x1etime +set -U fish_color_autosuggestion brblack +set -U fish_color_cancel \x2dr +set -U fish_color_command blue +set -U fish_color_comment red +set -U fish_color_cwd green +set -U fish_color_cwd_root red +set -U fish_color_end green +set -U fish_color_error brred +set -U fish_color_escape brcyan +set -U fish_color_history_current \x2d\x2dbold +set -U fish_color_host normal +set -U fish_color_host_remote yellow +set -U fish_color_normal normal +set -U fish_color_operator brcyan +set -U fish_color_param cyan +set -U fish_color_quote yellow +set -U fish_color_redirection cyan\x1e\x2d\x2dbold +set -U fish_color_search_match bryellow\x1e\x2d\x2dbackground\x3dbrblack +set -U fish_color_selection white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +set -U fish_color_status red +set -U fish_color_user brgreen +set -U fish_color_valid_path \x2d\x2dunderline +set -U fish_key_bindings fish_default_key_bindings +set -U fish_pager_color_completion normal +set -U fish_pager_color_description yellow\x1e\x2di +set -U fish_pager_color_prefix normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +set -U fish_pager_color_progress brwhite\x1e\x2d\x2dbackground\x3dcyan +set -U fish_pager_color_selected_background \x2dr +set -U tide_aws_bg_color normal +set -U tide_aws_color FF9900 +set -U tide_aws_icon \uf270 +set -U tide_character_color 5FD700 +set -U tide_character_color_failure FF0000 +set -U tide_character_icon \u276f +set -U tide_character_vi_icon_default \u276e +set -U tide_character_vi_icon_replace \u25b6 +set -U tide_character_vi_icon_visual V +set -U tide_cmd_duration_bg_color normal +set -U tide_cmd_duration_color 87875F +set -U tide_cmd_duration_decimals 0 +set -U tide_cmd_duration_icon \x1d +set -U tide_cmd_duration_threshold 3000 +set -U tide_context_always_display false +set -U tide_context_bg_color normal +set -U tide_context_color_default D7AF87 +set -U tide_context_color_root D7AF00 +set -U tide_context_color_ssh D7AF87 +set -U tide_context_hostname_parts 1 +set -U tide_crystal_bg_color normal +set -U tide_crystal_color FFFFFF +set -U tide_crystal_icon \ue62f +set -U tide_direnv_bg_color normal +set -U tide_direnv_bg_color_denied normal +set -U tide_direnv_color D7AF00 +set -U tide_direnv_color_denied FF0000 +set -U tide_direnv_icon \u25bc +set -U tide_distrobox_bg_color normal +set -U tide_distrobox_color FF00FF +set -U tide_distrobox_icon \U000f01a7 +set -U tide_docker_bg_color normal +set -U tide_docker_color 2496ED +set -U tide_docker_default_contexts default\x1ecolima +set -U tide_docker_icon \uf308 +set -U tide_elixir_bg_color normal +set -U tide_elixir_color 4E2A8E +set -U tide_elixir_icon \ue62d +set -U tide_gcloud_bg_color normal +set -U tide_gcloud_color 4285F4 +set -U tide_gcloud_icon \U000f02ad +set -U tide_git_bg_color normal +set -U tide_git_bg_color_unstable normal +set -U tide_git_bg_color_urgent normal +set -U tide_git_color_branch 5FD700 +set -U tide_git_color_conflicted FF0000 +set -U tide_git_color_dirty D7AF00 +set -U tide_git_color_operation FF0000 +set -U tide_git_color_staged D7AF00 +set -U tide_git_color_stash 5FD700 +set -U tide_git_color_untracked 00AFFF +set -U tide_git_color_upstream 5FD700 +set -U tide_git_icon \x1d +set -U tide_git_truncation_length 24 +set -U tide_git_truncation_strategy \x1d +set -U tide_go_bg_color normal +set -U tide_go_color 00ACD7 +set -U tide_go_icon \ue627 +set -U tide_java_bg_color normal +set -U tide_java_color ED8B00 +set -U tide_java_icon \ue256 +set -U tide_jobs_bg_color normal +set -U tide_jobs_color 5FAF00 +set -U tide_jobs_icon \uf013 +set -U tide_jobs_number_threshold 1000 +set -U tide_kubectl_bg_color normal +set -U tide_kubectl_color 326CE5 +set -U tide_kubectl_icon \U000f10fe +set -U tide_left_prompt_frame_enabled false +set -U tide_left_prompt_items pwd\x1egit\x1enewline\x1echaracter +set -U tide_left_prompt_prefix +set -U tide_left_prompt_separator_diff_color \x20 +set -U tide_left_prompt_separator_same_color \x20 +set -U tide_left_prompt_suffix \x20 +set -U tide_nix_shell_bg_color normal +set -U tide_nix_shell_color 7EBAE4 +set -U tide_nix_shell_icon \uf313 +set -U tide_node_bg_color normal +set -U tide_node_color 44883E +set -U tide_node_icon \ue24f +set -U tide_os_bg_color normal +set -U tide_os_color normal +set -U tide_os_icon \uf313 +set -U tide_php_bg_color normal +set -U tide_php_color 617CBE +set -U tide_php_icon \ue608 +set -U tide_private_mode_bg_color normal +set -U tide_private_mode_color FFFFFF +set -U tide_private_mode_icon \U000f05f9 +set -U tide_prompt_add_newline_before false +set -U tide_prompt_color_frame_and_connection 585858 +set -U tide_prompt_color_separator_same_color 949494 +set -U tide_prompt_icon_connection \u00b7 +set -U tide_prompt_min_cols 34 +set -U tide_prompt_pad_items false +set -U tide_prompt_transient_enabled true +set -U tide_pulumi_bg_color normal +set -U tide_pulumi_color F7BF2A +set -U tide_pulumi_icon \uf1b2 +set -U tide_pwd_bg_color normal +set -U tide_pwd_color_anchors 00AFFF +set -U tide_pwd_color_dirs 0087AF +set -U tide_pwd_color_truncated_dirs 8787AF +set -U tide_pwd_icon \x1d +set -U tide_pwd_icon_home \x1d +set -U tide_pwd_icon_unwritable \uf023 +set -U tide_pwd_markers \x2ebzr\x1e\x2ecitc\x1e\x2egit\x1e\x2ehg\x1e\x2enode\x2dversion\x1e\x2epython\x2dversion\x1e\x2eruby\x2dversion\x1e\x2eshorten_folder_marker\x1e\x2esvn\x1e\x2eterraform\x1eCargo\x2etoml\x1ecomposer\x2ejson\x1eCVS\x1ego\x2emod\x1epackage\x2ejson\x1ebuild\x2ezig +set -U tide_python_bg_color normal +set -U tide_python_color 00AFAF +set -U tide_python_icon \U000f0320 +set -U tide_right_prompt_frame_enabled false +set -U tide_right_prompt_items status\x1ecmd_duration\x1econtext\x1ejobs\x1edirenv\x1enode\x1epython\x1erustc\x1ejava\x1ephp\x1epulumi\x1eruby\x1ego\x1egcloud\x1ekubectl\x1edistrobox\x1etoolbox\x1eterraform\x1eaws\x1enix_shell\x1ecrystal\x1eelixir\x1ezig\x1etime +set -U tide_right_prompt_prefix \x20 +set -U tide_right_prompt_separator_diff_color \x20 +set -U tide_right_prompt_separator_same_color \x20 +set -U tide_right_prompt_suffix +set -U tide_ruby_bg_color normal +set -U tide_ruby_color B31209 +set -U tide_ruby_icon \ue23e +set -U tide_rustc_bg_color normal +set -U tide_rustc_color F74C00 +set -U tide_rustc_icon \ue7a8 +set -U tide_shlvl_bg_color normal +set -U tide_shlvl_color d78700 +set -U tide_shlvl_icon \uf120 +set -U tide_shlvl_threshold 1 +set -U tide_status_bg_color normal +set -U tide_status_bg_color_failure normal +set -U tide_status_color 5FAF00 +set -U tide_status_color_failure D70000 +set -U tide_status_icon \u2714 +set -U tide_status_icon_failure \u2718 +set -U tide_terraform_bg_color normal +set -U tide_terraform_color 844FBA +set -U tide_terraform_icon \U000f1062 +set -U tide_time_bg_color normal +set -U tide_time_color 5F8787 +set -U tide_time_format \x25r +set -U tide_toolbox_bg_color normal +set -U tide_toolbox_color 613583 +set -U tide_toolbox_icon \ue24f +set -U tide_vi_mode_bg_color_default normal +set -U tide_vi_mode_bg_color_insert normal +set -U tide_vi_mode_bg_color_replace normal +set -U tide_vi_mode_bg_color_visual normal +set -U tide_vi_mode_color_default 949494 +set -U tide_vi_mode_color_insert 87AFAF +set -U tide_vi_mode_color_replace 87AF87 +set -U tide_vi_mode_color_visual FF8700 +set -U tide_vi_mode_icon_default D +set -U tide_vi_mode_icon_insert I +set -U tide_vi_mode_icon_replace R +set -U tide_vi_mode_icon_visual V +set -U tide_zig_bg_color normal +set -U tide_zig_color F7A41D +set -U tide_zig_icon \ue6a9 + +set fish_greeting # Disable greeting + +fastfetch \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/default.nix similarity index 96% rename from nixos/configuration.nix rename to nixos/default.nix index 3c50535..87ddd14 100644 --- a/nixos/configuration.nix +++ b/nixos/default.nix @@ -10,15 +10,18 @@ in { [ # Include the default lxc/lxd configuration. "${modulesPath}/virtualisation/lxc-container.nix" - - # Nginx - ./imports/nginx.nix - # Nextcloud - ./imports/nextcloud.nix - # Snapraid-runner - ./imports/snapraid.nix # Import hardware configuration. ./hardware-configuration.nix + + # Module imports + # ACME + ./modules/acme + # Nextcloud + ./modules/nextcloud + # Nginx + ./modules/nginx + # Snapraid-runner + ./modules/snapraid ]; # OVERLAYS for custom packages. diff --git a/nixos/modules/acme/default.nix b/nixos/modules/acme/default.nix new file mode 100644 index 0000000..0b700d3 --- /dev/null +++ b/nixos/modules/acme/default.nix @@ -0,0 +1,10 @@ +{ + # TODO: find out how to add the certs from my nginx doxker since this jurs errors always + + # letsencrypt this wont do shit but allows things to work + # i take care of this on dockge lxc + security.acme = { + acceptTerms = true; + defaults.email = "chris@toph.cc"; + }; +} \ No newline at end of file diff --git a/nixos/imports/nextcloud.nix b/nixos/modules/nextcloud/default.nix similarity index 100% rename from nixos/imports/nextcloud.nix rename to nixos/modules/nextcloud/default.nix diff --git a/nixos/imports/nginx.nix b/nixos/modules/nginx/default.nix similarity index 76% rename from nixos/imports/nginx.nix rename to nixos/modules/nginx/default.nix index fbb0f4c..92a356d 100644 --- a/nixos/imports/nginx.nix +++ b/nixos/modules/nginx/default.nix @@ -1,11 +1,4 @@ { - # letsencrypt this wont do shit but allows things to work - # i take care of this on dockge lxc - security.acme = { - acceptTerms = true; - defaults.email = "chris@toph.cc"; - }; - # Nginx services.nginx = { diff --git a/nixos/imports/snapraid.nix b/nixos/modules/snapraid/default.nix similarity index 100% rename from nixos/imports/snapraid.nix rename to nixos/modules/snapraid/default.nix diff --git a/nixos/imports/snapraid.conf b/nixos/modules/snapraid/snapraid.conf similarity index 100% rename from nixos/imports/snapraid.conf rename to nixos/modules/snapraid/snapraid.conf