From 905cc9a88553a14246830d12aa5082bb3b2bedb3 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:49:52 +0200 Subject: [PATCH] Update --- home/programs/fetch/neofetch/default.nix | 5 +- home/programs/fetch/nerdfetch/default.nix | 8 +- home/programs/nvim/keymaps.nix | 10 +- home/programs/nvim/plugins/dashboard.nix | 6 +- home/programs/nvim/plugins/ui.nix | 4 +- home/programs/nvim/plugins/utils.nix | 3 +- home/programs/qutebrowser/default.nix | 10 +- home/programs/shell/default.nix | 11 +- home/programs/shell/lazygit.nix | 13 - home/programs/shell/starship.nix | 4 +- home/system/gtk/default.nix | 253 +++++++++--------- home/system/hyprland/default.nix | 2 +- home/system/hyprland/hypridle.nix | 3 - home/system/hyprland/hyprlock.nix | 41 +-- home/system/hyprland/hyprpanel.nix | 96 +++---- home/system/hyprland/hyprpaper.nix | 7 +- home/system/wlogout/default.nix | 117 -------- home/system/wlogout/icons/hibernate.png | Bin 4687 -> 0 bytes home/system/wlogout/icons/lock.png | Bin 2983 -> 0 bytes home/system/wlogout/icons/logout.png | Bin 3660 -> 0 bytes home/system/wlogout/icons/reboot.png | Bin 3957 -> 0 bytes home/system/wlogout/icons/shutdown.png | Bin 4124 -> 0 bytes home/system/wlogout/icons/suspend.png | Bin 4510 -> 0 bytes hosts/laptop/configuration.nix | 71 ++--- hosts/laptop/home.nix | 3 +- hosts/laptop/variables.nix | 29 +- hosts/modules/grub.nix | 12 - hosts/modules/gvfs.nix | 1 - hosts/modules/ovpn.nix | 10 - hosts/modules/power-profiles.nix | 1 - hosts/modules/tailscale.nix | 1 - hosts/modules/usb.nix | 19 -- hosts/modules/zsh.nix | 8 - hosts/server/configuration.nix | 49 ---- hosts/server/hardware-configuration.nix | 31 --- hosts/server/home.nix | 45 ---- hosts/server/modules/exposed/bitcoin-git.nix | 36 --- .../modules/exposed/cloudflare-dyndns.nix | 20 -- hosts/server/modules/exposed/kuma.nix | 14 - hosts/server/modules/exposed/nextcloud.nix | 28 -- hosts/server/modules/exposed/nginx.nix | 10 - hosts/server/modules/exposed/ntfy-sh.nix | 21 -- hosts/server/modules/exposed/tailscale.nix | 13 - hosts/server/modules/exposed/vaultwarden.nix | 22 -- hosts/server/modules/internal/adguard.nix | 12 - hosts/server/modules/internal/cockpit.nix | 15 -- hosts/server/modules/internal/openssh.nix | 18 -- hosts/server/modules/internal/security.nix | 8 - hosts/server/modules/jackflix/default.nix | 84 ------ .../server/modules/jackflix/transmission.nix | 21 -- hosts/server/modules/www/anotherhadi.com.nix | 7 - hosts/server/modules/www/default.nix | 7 - .../modules/www/home.anotherhadi.com.nix | 147 ---------- hosts/server/secrets/default.nix | 39 --- hosts/server/secrets/secrets.yaml | 27 -- hosts/server/variables.nix | 34 --- hosts/themes/nixy.nix | 55 ---- hosts/themes/windows.nix | 55 ---- {hosts/modules => nixos}/audio.nix | 0 {hosts/modules => nixos}/auto-upgrade.nix | 0 {hosts/modules => nixos}/bluetooth.nix | 0 {hosts/modules => nixos}/fonts.nix | 9 +- {hosts/modules => nixos}/home-manager.nix | 0 {hosts/modules => nixos}/network-manager.nix | 0 {hosts/modules => nixos}/nix.nix | 0 {hosts/modules => nixos}/nvidia.nix | 0 {hosts/modules => nixos}/prime.nix | 0 {hosts/modules => nixos}/systemd-boot.nix | 10 +- {hosts/modules => nixos}/timezone.nix | 0 {hosts/modules => nixos}/tuigreet.nix | 0 {hosts/modules => nixos}/users.nix | 1 + {hosts/modules => nixos}/utils.nix | 3 + {hosts/modules => nixos}/variables-config.nix | 0 .../modules/xorg.nix => nixos/xdg-portal.nix | 0 themes/nixy.nix | 62 +++++ 75 files changed, 326 insertions(+), 1325 deletions(-) delete mode 100644 home/programs/shell/lazygit.nix delete mode 100644 home/system/wlogout/default.nix delete mode 100644 home/system/wlogout/icons/hibernate.png delete mode 100644 home/system/wlogout/icons/lock.png delete mode 100644 home/system/wlogout/icons/logout.png delete mode 100644 home/system/wlogout/icons/reboot.png delete mode 100644 home/system/wlogout/icons/shutdown.png delete mode 100644 home/system/wlogout/icons/suspend.png delete mode 100644 hosts/modules/grub.nix delete mode 100644 hosts/modules/gvfs.nix delete mode 100644 hosts/modules/ovpn.nix delete mode 100644 hosts/modules/power-profiles.nix delete mode 100644 hosts/modules/tailscale.nix delete mode 100644 hosts/modules/usb.nix delete mode 100644 hosts/modules/zsh.nix delete mode 100644 hosts/server/configuration.nix delete mode 100644 hosts/server/hardware-configuration.nix delete mode 100644 hosts/server/home.nix delete mode 100644 hosts/server/modules/exposed/bitcoin-git.nix delete mode 100644 hosts/server/modules/exposed/cloudflare-dyndns.nix delete mode 100644 hosts/server/modules/exposed/kuma.nix delete mode 100644 hosts/server/modules/exposed/nextcloud.nix delete mode 100644 hosts/server/modules/exposed/nginx.nix delete mode 100644 hosts/server/modules/exposed/ntfy-sh.nix delete mode 100644 hosts/server/modules/exposed/tailscale.nix delete mode 100644 hosts/server/modules/exposed/vaultwarden.nix delete mode 100644 hosts/server/modules/internal/adguard.nix delete mode 100644 hosts/server/modules/internal/cockpit.nix delete mode 100644 hosts/server/modules/internal/openssh.nix delete mode 100644 hosts/server/modules/internal/security.nix delete mode 100644 hosts/server/modules/jackflix/default.nix delete mode 100644 hosts/server/modules/jackflix/transmission.nix delete mode 100644 hosts/server/modules/www/anotherhadi.com.nix delete mode 100644 hosts/server/modules/www/default.nix delete mode 100644 hosts/server/modules/www/home.anotherhadi.com.nix delete mode 100644 hosts/server/secrets/default.nix delete mode 100644 hosts/server/secrets/secrets.yaml delete mode 100644 hosts/server/variables.nix delete mode 100644 hosts/themes/nixy.nix delete mode 100644 hosts/themes/windows.nix rename {hosts/modules => nixos}/audio.nix (100%) rename {hosts/modules => nixos}/auto-upgrade.nix (100%) rename {hosts/modules => nixos}/bluetooth.nix (100%) rename {hosts/modules => nixos}/fonts.nix (84%) rename {hosts/modules => nixos}/home-manager.nix (100%) rename {hosts/modules => nixos}/network-manager.nix (100%) rename {hosts/modules => nixos}/nix.nix (100%) rename {hosts/modules => nixos}/nvidia.nix (100%) rename {hosts/modules => nixos}/prime.nix (100%) rename {hosts/modules => nixos}/systemd-boot.nix (54%) rename {hosts/modules => nixos}/timezone.nix (100%) rename {hosts/modules => nixos}/tuigreet.nix (100%) rename {hosts/modules => nixos}/users.nix (89%) rename {hosts/modules => nixos}/utils.nix (91%) rename {hosts/modules => nixos}/variables-config.nix (100%) rename hosts/modules/xorg.nix => nixos/xdg-portal.nix (100%) create mode 100644 themes/nixy.nix diff --git a/home/programs/fetch/neofetch/default.nix b/home/programs/fetch/neofetch/default.nix index 62885bb..96846db 100644 --- a/home/programs/fetch/neofetch/default.nix +++ b/home/programs/fetch/neofetch/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ pkgs, ... }: { home.packages = with pkgs; [ neofetch ]; xdg.configFile."neofetch/ascii.txt".text = '' @@ -109,9 +109,6 @@ song_format="%artist% - %album% - %title%" song_shorthand="off" mpc_args=() - colors=(${toString config.var.theme.colors.accentNumber} 1 ${ - toString config.var.theme.colors.accentNumber - } ${toString config.var.theme.colors.accentNumber} 7) bold="on" underline_enabled="on" underline_char="-" diff --git a/home/programs/fetch/nerdfetch/default.nix b/home/programs/fetch/nerdfetch/default.nix index 8808a22..eb70990 100644 --- a/home/programs/fetch/nerdfetch/default.nix +++ b/home/programs/fetch/nerdfetch/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: let nerdfetch = pkgs.writeShellScriptBin "nerdfetch" '' ostype="$(uname)" @@ -345,9 +345,9 @@ let ## USER VARIABLES -- YOU CAN CHANGE THESE - lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels - nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels - hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels + lc="$reset$bold$magenta" # labels + nc="$reset$bold$magenta" # labels + hn="$reset$bold$magenta" # labels ic="$reset$white" # info c0="$reset$grey" # first color c1="$reset$white" # second color diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix index abd331b..2ad6fc5 100644 --- a/home/programs/nvim/keymaps.nix +++ b/home/programs/nvim/keymaps.nix @@ -165,16 +165,16 @@ action = "lua require('telescope.builtin').spell_suggest()"; options.desc = "Spell Suggest"; } - { - key = "st"; - action = "lua require('telescope.builtin').treesitter()"; - options.desc = "Treesitter"; - } { key = "sr"; action = ":noh"; options.desc = "Reset search"; } + { + key = "st"; + action = "TodoTelescope"; + options.desc = "Todos"; + } # Trouble { diff --git a/home/programs/nvim/plugins/dashboard.nix b/home/programs/nvim/plugins/dashboard.nix index 7e4d42d..5812718 100644 --- a/home/programs/nvim/plugins/dashboard.nix +++ b/home/programs/nvim/plugins/dashboard.nix @@ -1,9 +1,9 @@ { config, ... }: { programs.nixvim.highlight = { - AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}"; - AlphaTextColor.fg = "#${config.var.theme.colors.fg}"; - AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}"; + AlphaHeaderColor.fg = "#${config.lib.stylix.colors.base0D}"; + AlphaTextColor.fg = "#${config.lib.stylix.colors.base05}"; + AlphaShortcutColor.fg = "#${config.lib.stylix.colors.base03}"; }; programs.nixvim.plugins.alpha = { diff --git a/home/programs/nvim/plugins/ui.nix b/home/programs/nvim/plugins/ui.nix index 200debd..b31f9e7 100644 --- a/home/programs/nvim/plugins/ui.nix +++ b/home/programs/nvim/plugins/ui.nix @@ -3,9 +3,9 @@ programs.nixvim = { highlight = { - Headline.bg = "#${config.var.theme.colors.bgalt}"; + Headline.bg = "#${config.lib.stylix.colors.base0D}"; Headline.bold = true; - Headline1.bg = "#${config.var.theme.colors.c0}"; + Headline1.bg = "#${config.lib.stylix.colors.base01}"; Headline1.bold = true; }; plugins = { diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix index e7799cb..59d3c16 100644 --- a/home/programs/nvim/plugins/utils.nix +++ b/home/programs/nvim/plugins/utils.nix @@ -1,7 +1,7 @@ { config, ... }: { programs.nixvim = { highlightOverride = { - FloatBorder.fg = "#${config.var.theme.colors.accent}"; + FloatBorder.fg = "#${config.lib.stylix.colors.base0D}"; }; plugins = { copilot-vim.enable = true; @@ -15,6 +15,7 @@ enable = true; extensions.fzf-native = { enable = true; }; }; + todo-comments.enable = true; treesitter = { enable = true; nixGrammars = true; diff --git a/home/programs/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix index e613c42..33cd02c 100644 --- a/home/programs/qutebrowser/default.nix +++ b/home/programs/qutebrowser/default.nix @@ -7,10 +7,10 @@ let "openLinksInNewTab": false, "locale": "fr-FR", "colors": { - "primary": "#${config.var.theme.colors.accent}", - "background": "#${config.var.theme.colors.bg}", - "foreground": "#${config.var.theme.colors.fg}", - "muted": "#${config.var.theme.colors.c8}" + "primary": "#${config.lib.stylix.colors.base0D}", + "background": "#${config.lib.stylix.colors.base00}", + "foreground": "#${config.lib.stylix.colors.base05}", + "muted": "#${config.lib.stylix.colors.base03}" }, "folders": [ { @@ -73,7 +73,7 @@ let in { - imports = [ ./duckduckgo-colorscheme.nix ]; + # imports = [ ./duckduckgo-colorscheme.nix ]; programs.qutebrowser = { enable = true; diff --git a/home/programs/shell/default.nix b/home/programs/shell/default.nix index 75a4b08..84d046f 100644 --- a/home/programs/shell/default.nix +++ b/home/programs/shell/default.nix @@ -1,11 +1,4 @@ { - imports = [ - ./fzf.nix - ./zsh.nix - ./starship.nix - ./zoxide.nix - ./tmux.nix - ./lazygit.nix - ./eza.nix - ]; + imports = + [ ./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./tmux.nix ./eza.nix ]; } diff --git a/home/programs/shell/lazygit.nix b/home/programs/shell/lazygit.nix deleted file mode 100644 index 52ff0ec..0000000 --- a/home/programs/shell/lazygit.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: { - programs.lazygit = { - enable = true; - settings = { - gui.theme = { - ligthTheme = false; - activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ]; - inactiveBorderColor = [ "black" ]; - selectedLineBgColor = [ "default" ]; - }; - }; - }; -} diff --git a/home/programs/shell/starship.nix b/home/programs/shell/starship.nix index 8935861..2e5fe5e 100644 --- a/home/programs/shell/starship.nix +++ b/home/programs/shell/starship.nix @@ -10,10 +10,10 @@ "$git_status" "$character" ]; - directory = { style = "#${config.var.theme.colors.accent}"; }; + directory = { style = "#${config.lib.stylix.colors.base0D}"; }; character = { - success_symbol = "[❯](#${config.var.theme.colors.accent})"; + success_symbol = "[❯](#${config.lib.stylix.colors.base0D})"; error_symbol = "[❯](red)"; vimcmd_symbol = "[❮](cyan)"; }; diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix index fe2da1c..f0bef3a 100644 --- a/home/system/gtk/default.nix +++ b/home/system/gtk/default.nix @@ -6,131 +6,130 @@ style.name = "gtk2"; }; - gtk = { - enable = true; - - theme = { name = "FlatColor"; }; - - iconTheme = { - package = pkgs.kora-icon-theme; - name = "Kora"; - }; - - font = { - name = config.var.theme.font; - size = config.var.theme.font-size; - }; - - gtk3.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme=1 - ''; - }; - - gtk4.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme=1 - ''; - }; - }; - - home.pointerCursor = { - gtk.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 14; - }; - - home.file = { - ".local/share/themes/FlatColor" = { - recursive = true; - source = pkgs.stdenv.mkDerivation { - name = "FlatColor"; - - src = pkgs.fetchFromGitHub { - owner = "jasperro"; - repo = "FlatColor"; - rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074"; - hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18="; - }; - - buildPhase = '' - mkdir -p $out - # delete the default gtk-color-scheme: - file="./gtk-2.0/gtkrc" - sed -i '3,29d' $file - sed -i '3i include "../colors2"' $file - - file="./gtk-3.0/gtk.css" - sed -i '2,10d' $file - sed -i '2i @import url("../colors3");' $file - - file="./gtk-3.20/gtk.css" - sed -i '2,26d' $file - sed -i '2i @import url("../colors3");' $file - - cp -r . $out - ''; - }; - }; - - ".local/share/themes/FlatColor/colors2".text = '' - bg_color:#${config.var.theme.colors.bg} - color0:#${config.var.theme.colors.c0} - color1:#${config.var.theme.colors.c1} - color2:#${config.var.theme.colors.c2} - color3:#${config.var.theme.colors.c3} - color4:#${config.var.theme.colors.c4} - color5:#${config.var.theme.colors.c5} - color6:#${config.var.theme.colors.c6} - color7:#${config.var.theme.colors.c7} - color8:#${config.var.theme.colors.c8} - color9:#${config.var.theme.colors.c9} - color10:#${config.var.theme.colors.c10} - color11:#${config.var.theme.colors.c11} - color12:#${config.var.theme.colors.c12} - color13:#${config.var.theme.colors.c13} - color14:#${config.var.theme.colors.c14} - color15:#${config.var.theme.colors.c15} - text_color:#${config.var.theme.colors.fg} - selected_bg_color:#${config.var.theme.colors.accent} - selected_fg_color:#${config.var.theme.colors.accentFg} - tooltip_bg_color:#${config.var.theme.colors.bgalt} - tooltip_fg_color:#${config.var.theme.colors.fgalt} - titlebar_bg_color:#${config.var.theme.colors.bgalt} - titlebar_fg_color:#${config.var.theme.colors.fgalt} - menu_bg_color:#${config.var.theme.colors.bgalt} - menu_fg_color:#${config.var.theme.colors.fgalt} - link_color:#${config.var.theme.colors.accent} - ''; - - ".local/share/themes/FlatColor/colors3".text = '' - @define-color color0 #${config.var.theme.colors.c0}; - @define-color color1 #${config.var.theme.colors.c1}; - @define-color color2 #${config.var.theme.colors.c2}; - @define-color color3 #${config.var.theme.colors.c3}; - @define-color color4 #${config.var.theme.colors.c4}; - @define-color color5 #${config.var.theme.colors.c5}; - @define-color color6 #${config.var.theme.colors.c6}; - @define-color color7 #${config.var.theme.colors.c7}; - @define-color color8 #${config.var.theme.colors.c8}; - @define-color color9 #${config.var.theme.colors.c9}; - @define-color color10 #${config.var.theme.colors.c10}; - @define-color color11 #${config.var.theme.colors.c11}; - @define-color color12 #${config.var.theme.colors.c12}; - @define-color color13 #${config.var.theme.colors.c13}; - @define-color color14 #${config.var.theme.colors.c14}; - @define-color color15 #${config.var.theme.colors.c15}; - @define-color selected_bg_color #${config.var.theme.colors.accent}; - @define-color selected_fg_color #${config.var.theme.colors.accentFg}; - - @define-color bg_color #${config.var.theme.colors.bg}; - @define-color fg_color #${config.var.theme.colors.fg}; - @define-color base_color @bg_color; - @define-color text_color @fg_color; - @define-color text_color_disabled mix(@text_color, @base_color, 0.4); - @define-color tooltip_bg_color #${config.var.theme.colors.bgalt}; - @define-color tooltip_fg_color #${config.var.theme.colors.fgalt}; - ''; - }; + gtk = { enable = true; }; + # + # theme = { name = "FlatColor"; }; + # + # iconTheme = { + # package = pkgs.kora-icon-theme; + # name = "Kora"; + # }; + # + # font = { + # name = config.var.theme.font; + # size = config.var.theme.font-size; + # }; + # + # gtk3.extraConfig = { + # Settings = '' + # gtk-application-prefer-dark-theme=1 + # ''; + # }; + # + # gtk4.extraConfig = { + # Settings = '' + # gtk-application-prefer-dark-theme=1 + # ''; + # }; + # }; + # + # home.pointerCursor = { + # gtk.enable = true; + # package = pkgs.bibata-cursors; + # name = "Bibata-Modern-Classic"; + # size = 14; + # }; + # + # home.file = { + # ".local/share/themes/FlatColor" = { + # recursive = true; + # source = pkgs.stdenv.mkDerivation { + # name = "FlatColor"; + # + # src = pkgs.fetchFromGitHub { + # owner = "jasperro"; + # repo = "FlatColor"; + # rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074"; + # hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18="; + # }; + # + # buildPhase = '' + # mkdir -p $out + # # delete the default gtk-color-scheme: + # file="./gtk-2.0/gtkrc" + # sed -i '3,29d' $file + # sed -i '3i include "../colors2"' $file + # + # file="./gtk-3.0/gtk.css" + # sed -i '2,10d' $file + # sed -i '2i @import url("../colors3");' $file + # + # file="./gtk-3.20/gtk.css" + # sed -i '2,26d' $file + # sed -i '2i @import url("../colors3");' $file + # + # cp -r . $out + # ''; + # }; + # }; + # + # ".local/share/themes/FlatColor/colors2".text = '' + # bg_color:#${config.var.theme.colors.bg} + # color0:#${config.var.theme.colors.c0} + # color1:#${config.var.theme.colors.c1} + # color2:#${config.var.theme.colors.c2} + # color3:#${config.var.theme.colors.c3} + # color4:#${config.var.theme.colors.c4} + # color5:#${config.var.theme.colors.c5} + # color6:#${config.var.theme.colors.c6} + # color7:#${config.var.theme.colors.c7} + # color8:#${config.var.theme.colors.c8} + # color9:#${config.var.theme.colors.c9} + # color10:#${config.var.theme.colors.c10} + # color11:#${config.var.theme.colors.c11} + # color12:#${config.var.theme.colors.c12} + # color13:#${config.var.theme.colors.c13} + # color14:#${config.var.theme.colors.c14} + # color15:#${config.var.theme.colors.c15} + # text_color:#${config.var.theme.colors.fg} + # selected_bg_color:#${config.var.theme.colors.accent} + # selected_fg_color:#${config.var.theme.colors.accentFg} + # tooltip_bg_color:#${config.var.theme.colors.bgalt} + # tooltip_fg_color:#${config.var.theme.colors.fgalt} + # titlebar_bg_color:#${config.var.theme.colors.bgalt} + # titlebar_fg_color:#${config.var.theme.colors.fgalt} + # menu_bg_color:#${config.var.theme.colors.bgalt} + # menu_fg_color:#${config.var.theme.colors.fgalt} + # link_color:#${config.var.theme.colors.accent} + # ''; + # + # ".local/share/themes/FlatColor/colors3".text = '' + # @define-color color0 #${config.var.theme.colors.c0}; + # @define-color color1 #${config.var.theme.colors.c1}; + # @define-color color2 #${config.var.theme.colors.c2}; + # @define-color color3 #${config.var.theme.colors.c3}; + # @define-color color4 #${config.var.theme.colors.c4}; + # @define-color color5 #${config.var.theme.colors.c5}; + # @define-color color6 #${config.var.theme.colors.c6}; + # @define-color color7 #${config.var.theme.colors.c7}; + # @define-color color8 #${config.var.theme.colors.c8}; + # @define-color color9 #${config.var.theme.colors.c9}; + # @define-color color10 #${config.var.theme.colors.c10}; + # @define-color color11 #${config.var.theme.colors.c11}; + # @define-color color12 #${config.var.theme.colors.c12}; + # @define-color color13 #${config.var.theme.colors.c13}; + # @define-color color14 #${config.var.theme.colors.c14}; + # @define-color color15 #${config.var.theme.colors.c15}; + # @define-color selected_bg_color #${config.var.theme.colors.accent}; + # @define-color selected_fg_color #${config.var.theme.colors.accentFg}; + # + # @define-color bg_color #${config.var.theme.colors.bg}; + # @define-color fg_color #${config.var.theme.colors.fg}; + # @define-color base_color @bg_color; + # @define-color text_color @fg_color; + # @define-color text_color_disabled mix(@text_color, @base_color, 0.4); + # @define-color tooltip_bg_color #${config.var.theme.colors.bgalt}; + # @define-color tooltip_fg_color #${config.var.theme.colors.fgalt}; + # ''; + # }; } diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index c782f47..faec9eb 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -4,7 +4,7 @@ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix - ./hyprcursor.nix + # ./hyprcursor.nix ./hyprpanel.nix ]; diff --git a/home/system/hyprland/hypridle.nix b/home/system/hyprland/hypridle.nix index 10ce7c0..31f0c4f 100644 --- a/home/system/hyprland/hypridle.nix +++ b/home/system/hyprland/hypridle.nix @@ -1,7 +1,4 @@ { pkgs, ... }: { - # wayland.windowManager.hyprland.settings.exec-once = - # [ "${pkgs.hypridle}/bin/hypridle" ]; - services.hypridle = { enable = true; settings = { diff --git a/home/system/hyprland/hyprlock.nix b/home/system/hyprland/hyprlock.nix index 97d544f..6bb410f 100644 --- a/home/system/hyprland/hyprlock.nix +++ b/home/system/hyprland/hyprlock.nix @@ -1,5 +1,6 @@ -{ config, ... }: { - +{ config, ... }: +let foreground = "rgba(216, 222, 233, 0.70)"; +in { programs.hyprlock = { enable = true; settings = { @@ -12,10 +13,10 @@ # BACKGROUND background = { monitor = ""; - path = "~/wallpapers/${config.var.theme.wallpaper}"; + path = toString config.stylix.image; blur_passes = 0; contrast = 0.8916; - brightness = 0.8172; + brightness = 0.7172; vibrancy = 0.1696; vibrancy_darkness = 0.0; }; @@ -25,9 +26,9 @@ # Day-Month-Date monitor = ""; text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"''; - color = "rgba(216, 222, 233, .7)"; + color = foreground; font_size = 28; - font_family = "SFProDisplay Nerd Font Bold"; + font_family = config.stylix.fonts.serif.name + " Bold"; position = "0, 490"; halign = "center"; valign = "center"; @@ -36,7 +37,7 @@ { monitor = ""; text = ''cmd[update:1000] echo "$(date +"%I:%M")"''; - color = "rgba(216, 222, 233, .7)"; + color = foreground; font_size = 160; font_family = "steelfish outline regular"; position = "0, 370"; @@ -47,34 +48,19 @@ { monitor = ""; text = " $USER"; - color = "rgba(216, 222, 233, 0.80)"; + color = foreground; outline_thickness = 2; dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true; font_size = 18; - font_family = "SFProDisplay Nerd Font Bold"; + font_family = config.stylix.fonts.serif.name + " Bold"; position = "0, -180"; halign = "center"; valign = "center"; } ]; - # Foreground - # image = [{ - # monitor = ""; - # path = "~/.config/hypr/foreground.png"; - # size = 700; - # border_size = 0; - # rounding = 0; - # rotate = 0; - # reload_time = 0; - # reload_cmd = ""; - # position = "0, -66"; - # halign = "center"; - # valign = "center"; - # }]; - # INPUT FIELD input-field = [{ monitor = ""; @@ -85,11 +71,10 @@ dots_center = true; outer_color = "rgba(255, 255, 255, 0)"; inner_color = "rgba(255, 255, 255, 0.1)"; - font_color = "rgb(200, 200, 200)"; + font_color = foreground; fade_on_empty = false; - font_family = "SFProDisplay Nerd Font Bold"; - placeholder_text = - ''🔒 Enter Pass''; + font_family = config.stylix.fonts.serif.name + " Bold"; + placeholder_text = "🔒 Enter Pass"; hide_input = false; position = "0, -250"; halign = "center"; diff --git a/home/system/hyprland/hyprpanel.nix b/home/system/hyprland/hyprpanel.nix index 3ebdcdc..89e885c 100644 --- a/home/system/hyprland/hyprpanel.nix +++ b/home/system/hyprland/hyprpanel.nix @@ -67,7 +67,7 @@ ] } }, - "theme.font.name": "${config.var.theme.font}", + "theme.font.name": "${config.stylix.fonts.serif.name}", "theme.font.size": "${toString config.var.theme.bar.font-size}px", "theme.bar.outer_spacing": "${ if config.var.theme.bar.floating @@ -96,9 +96,9 @@ "theme.bar.buttons.padding_x": "0.8rem", "theme.bar.buttons.padding_y": "0.4rem", - "theme.bar.buttons.workspaces.hover": "#${config.var.theme.colors.accentalt}", - "theme.bar.buttons.workspaces.active": "#${config.var.theme.colors.accent}", - "theme.bar.buttons.workspaces.available": "#${config.var.theme.colors.bg}", + "theme.bar.buttons.workspaces.hover": "#${config.lib.stylix.colors.base0A}", + "theme.bar.buttons.workspaces.active": "#${config.lib.stylix.colors.base0D}", + "theme.bar.buttons.workspaces.available": "#${config.lib.stylix.colors.base00}", "theme.bar.margin_top": "1.0em", "theme.bar.margin_sides": "${toString config.var.theme.gaps-out}px", @@ -168,61 +168,61 @@ "theme.bar.menus.monochrome": true, "wallpaper.enable": false, - "theme.bar.menus.background": "#${config.var.theme.colors.bg}", - "theme.bar.menus.cards": "#${config.var.theme.colors.bgalt}", + "theme.bar.menus.background": "#${config.lib.stylix.colors.base00}", + "theme.bar.menus.cards": "#${config.lib.stylix.colors.base01}", "theme.bar.menus.card_radius": "${ toString config.var.theme.rounding }px", - "theme.bar.menus.label": "#${config.var.theme.colors.fg}", - "theme.bar.menus.text": "#${config.var.theme.colors.fg}", + "theme.bar.menus.label": "#${config.lib.stylix.colors.base05}", + "theme.bar.menus.text": "#${config.lib.stylix.colors.base05}", "theme.bar.menus.border.size": "${ toString config.var.theme.border-size }px", - "theme.bar.menus.border.color": "#${config.var.theme.colors.accent}", + "theme.bar.menus.border.color": "#${config.lib.stylix.colors.base0D}", "theme.bar.menus.border.radius": "${ toString config.var.theme.rounding }px", - "theme.bar.menus.popover.text": "#${config.var.theme.colors.fg}", - "theme.bar.menus.popover.background": "#${config.var.theme.colors.bgalt}", - "theme.bar.menus.listitems.active": "#${config.var.theme.colors.accent}", - "theme.bar.menus.icons.active": "#${config.var.theme.colors.accent}", - "theme.bar.menus.switch.enabled": "#${config.var.theme.colors.accent}", - "theme.bar.menus.check_radio_button.active": "#${config.var.theme.colors.accent}", - "theme.bar.menus.buttons.default": "#${config.var.theme.colors.accent}", - "theme.bar.menus.buttons.active": "#${config.var.theme.colors.accent}", - "theme.bar.menus.iconbuttons.active": "#${config.var.theme.colors.accent}", - "theme.bar.menus.progressbar.foreground": "#${config.var.theme.colors.accent}", - "theme.bar.menus.slider.primary": "#${config.var.theme.colors.accent}", - "theme.bar.menus.tooltip.background": "#${config.var.theme.colors.bgalt}", - "theme.bar.menus.tooltip.text": "#${config.var.theme.colors.fg}", - "theme.bar.menus.dropdownmenu.background": "#${config.var.theme.colors.bgalt}", - "theme.bar.menus.dropdownmenu.text": "#${config.var.theme.colors.fg}", - "theme.bar.background": "#${config.var.theme.colors.bg}", + "theme.bar.menus.popover.text": "#${config.lib.stylix.colors.base05}", + "theme.bar.menus.popover.background": "#${config.lib.stylix.colors.base01}", + "theme.bar.menus.listitems.active": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.icons.active": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.switch.enabled": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.check_radio_button.active": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.buttons.default": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.buttons.active": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.iconbuttons.active": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.progressbar.foreground": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.slider.primary": "#${config.lib.stylix.colors.base0D}", + "theme.bar.menus.tooltip.background": "#${config.lib.stylix.colors.base01}", + "theme.bar.menus.tooltip.text": "#${config.lib.stylix.colors.base05}", + "theme.bar.menus.dropdownmenu.background": "#${config.lib.stylix.colors.base01}", + "theme.bar.menus.dropdownmenu.text": "#${config.lib.stylix.colors.base05}", + "theme.bar.background": "#${config.lib.stylix.colors.base00}", "theme.bar.buttons.style": "default", "theme.bar.buttons.monochrome": true, - "theme.bar.buttons.text": "#${config.var.theme.colors.fg}", - "theme.bar.buttons.background": "#${config.var.theme.colors.bgalt}", - "theme.bar.buttons.icon": "#${config.var.theme.colors.accent}", - "theme.bar.buttons.notifications.background": "#${config.var.theme.colors.bgalt}", - "theme.bar.buttons.hover": "#${config.var.theme.colors.bg}", - "theme.bar.buttons.notifications.hover": "#${config.var.theme.colors.bg}", - "theme.bar.buttons.notifications.total": "#${config.var.theme.colors.accent}", - "theme.bar.buttons.notifications.icon": "#${config.var.theme.colors.accent}", - "theme.notification.background": "#${config.var.theme.colors.bgalt}", - "theme.notification.actions.background": "#${config.var.theme.colors.accent}", - "theme.notification.actions.text": "#${config.var.theme.colors.fg}", - "theme.notification.label": "#${config.var.theme.colors.accent}", - "theme.notification.border": "#${config.var.theme.colors.bgalt}", - "theme.notification.text": "#${config.var.theme.colors.fgalt}", - "theme.notification.labelicon": "#${config.var.theme.colors.accent}", - "theme.osd.bar_color": "#${config.var.theme.colors.accent}", - "theme.osd.bar_overflow_color": "#${config.var.theme.colors.accentalt}", - "theme.osd.icon": "#${config.var.theme.colors.bg}", - "theme.osd.icon_container": "#${config.var.theme.colors.accent}", - "theme.osd.label": "#${config.var.theme.colors.accent}", - "theme.osd.bar_container": "#${config.var.theme.colors.bgalt}", - "theme.bar.menus.menu.media.background.color": "#${config.var.theme.colors.bgalt}", - "theme.bar.menus.menu.media.card.color": "#${config.var.theme.colors.bgalt}", + "theme.bar.buttons.text": "#${config.lib.stylix.colors.base05}", + "theme.bar.buttons.background": "#${config.lib.stylix.colors.base01}", + "theme.bar.buttons.icon": "#${config.lib.stylix.colors.base0D}", + "theme.bar.buttons.notifications.background": "#${config.lib.stylix.colors.base01}", + "theme.bar.buttons.hover": "#${config.lib.stylix.colors.base00}", + "theme.bar.buttons.notifications.hover": "#${config.lib.stylix.colors.base00}", + "theme.bar.buttons.notifications.total": "#${config.lib.stylix.colors.base0D}", + "theme.bar.buttons.notifications.icon": "#${config.lib.stylix.colors.base0D}", + "theme.notification.background": "#${config.lib.stylix.colors.base01}", + "theme.notification.actions.background": "#${config.lib.stylix.colors.base0D}", + "theme.notification.actions.text": "#${config.lib.stylix.colors.base05}", + "theme.notification.label": "#${config.lib.stylix.colors.base0D}", + "theme.notification.border": "#${config.lib.stylix.colors.base01}", + "theme.notification.text": "#${config.lib.stylix.colors.base05}", + "theme.notification.labelicon": "#${config.lib.stylix.colors.base0D}", + "theme.osd.bar_color": "#${config.lib.stylix.colors.base0D}", + "theme.osd.bar_overflow_color": "#${config.lib.stylix.colors.base0A}", + "theme.osd.icon": "#${config.lib.stylix.colors.base00}", + "theme.osd.icon_container": "#${config.lib.stylix.colors.base0D}", + "theme.osd.label": "#${config.lib.stylix.colors.base0D}", + "theme.osd.bar_container": "#${config.lib.stylix.colors.base01}", + "theme.bar.menus.menu.media.background.color": "#${config.lib.stylix.colors.base01}", + "theme.bar.menus.menu.media.card.color": "#${config.lib.stylix.colors.base01}", "theme.bar.menus.menu.media.card.tint": 90, "bar.customModules.updates.pollingInterval": 1440000, "bar.media.show_active_only": true diff --git a/home/system/hyprland/hyprpaper.nix b/home/system/hyprland/hyprpaper.nix index 61ed30c..d4e76bd 100644 --- a/home/system/hyprland/hyprpaper.nix +++ b/home/system/hyprland/hyprpaper.nix @@ -1,15 +1,10 @@ -{ pkgs, config, ... }: { - # wayland.windowManager.hyprland.settings.exec-once = - # [ "${pkgs.hyprpaper}/bin/hyprpaper" ]; - +{ ... }: { services.hyprpaper = { enable = true; settings = { ipc = "on"; splash = false; splash_offset = 2.0; - preload = [ "~/wallpapers/${config.var.theme.wallpaper}" ]; - wallpaper = [ ",~/wallpapers/${config.var.theme.wallpaper}" ]; }; }; } diff --git a/home/system/wlogout/default.nix b/home/system/wlogout/default.nix deleted file mode 100644 index 3d7604b..0000000 --- a/home/system/wlogout/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ config, pkgs, ... }: { - - programs.wlogout = { - enable = true; - layout = [ - { - label = "shutdown"; - action = "systemctl poweroff"; - text = "Shutdown"; - keybind = "s"; - } - { - label = "reboot"; - action = "systemctl reboot"; - text = "Reboot"; - keybind = "r"; - } - { - label = "lock"; - action = "${pkgs.hyprlock}/bin/hyprlock"; - text = "Lock"; - keybind = "l"; - } - { - label = "suspend"; - action = "systemctl suspend"; - text = "Suspend"; - keybind = "u"; - } - { - label = "logout"; - action = "killall -9 Hyprland sleep 2"; - text = "Exit"; - keybind = "e"; - } - { - label = "hibernate"; - action = "systemctl hibernate"; - text = "Hibernate"; - keybind = "h"; - } - ]; - - style = '' - * { - font-family: "${config.var.theme.font}"; - background-image: none; - transition: 20ms; - } - - window { - background-color: rgba(12,12,12,0.5); - } - - button { - color: #${config.var.theme.colors.fg}; - font-size:20px; - - background-repeat: no-repeat; - background-position: center; - background-size: 25%; - - border: 3px solid #${config.var.theme.colors.bg}; - background-color: #${config.var.theme.colors.bg}; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); - } - - button:focus, - button:active { - color: #${config.var.theme.colors.accentFg}; - background-color: #${config.var.theme.colors.accent}; - border: 3px solid #${config.var.theme.colors.accent}; - } - - /* - ----------------------------------------------------- - Buttons - ----------------------------------------------------- - */ - - #lock,#logout,#suspend,#hibernate,#shutdown,#reboot { - margin: 10px; - border-radius: ${toString config.var.theme.rounding}px; - } - - #lock { - background-image: image(url("icons/lock.png")); - } - - #logout { - background-image: image(url("icons/logout.png")); - } - - #suspend { - background-image: image(url("icons/suspend.png")); - } - - #hibernate { - background-image: image(url("icons/hibernate.png")); - } - - #shutdown { - background-image: image(url("icons/shutdown.png")); - } - - #reboot { - background-image: image(url("icons/reboot.png")); - } - ''; - }; - - xdg.configFile."wlogout/icons" = { - recursive = false; - source = ./icons; - }; - -} diff --git a/home/system/wlogout/icons/hibernate.png b/home/system/wlogout/icons/hibernate.png deleted file mode 100644 index bf2b0010414af5077f0a63d61a9b04c839038e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4687 zcmbVP30PCtwqECCBtZxoW`t-RVxfjfK}9$SD2Pg&Dr&`uh*}j>@G%I&Az>)RLKKQx z2cTMQrDcd-!51PyKvF@)suh$W3=gG(MxYRp;ce7=+wZ;mzWctL@5{IU|E#sw-fORQ z_F5-RxMsx^mIVs{rug}KuLHml#DPgi!(jBo5dbWCua}q5&&!J^4nG*WcmFN`{;?y+ zmikr^RyEt#*A#svHTJf0+%We=-pq~-1;Qj&{-=8$Rd)R<*z>FGLYXV8kjC&ZDKMCS z_dgexu_PMCmj&rr-=$~kDlRn4{7u>!U#=J~i)An$&3y3FHD+GVwNqdE)NDAsu{YYs zl-?lyqW*ThWB06i89ALVtle+4CdYjGA|fFpXu(bg)!eBoPVRV8ZCU-`^tH;ETvv6! zd}Z7kx6of{X*SmjqepKodL~ynNkbhS0<314M6CYF*`e;V#cS>tzK;&wHeF|3aHiCC zUyWlyTULd=?Ea>l>uVy+9PEPirh4=F=gFD-llDIHE0N`m?O{*IUYt;WFDroM8MN#? z&&V-Nf>yEBcFCgl*|hJ7x9Od6M`5~x__@Qitu|x*5^VII>YG;WiOZ_`xjo;cm@LLe zt|g|wNV(XHomisMWX(7&w|%ph)nuoQU*48YA32!#azRn)i2E8Fa@KzsS6~JPiTAB` z6_rLu?T$D&aqh?AVG3vN;-K^$bR-_L`ihDAN8JVxf07FVVPEB+BcI$syrJ+E`4)YBRO(c`|wNQXlgz3NlqB!>e$N(ef| zn$kg@VOJtf?ker#*>p*9^1rS%@@zwraZ!FrJU*e)KO0Mz(y3%mb z<|$`=XiYP>a)JH1CuaW9PA;VHo#)xAwv0Isfy>jGaz+yZL>(iXx#$7}F7{{iGh+}~ zm`<1LH6dWnraQ9CzlT6Oe_H>_pnM3NQ%9Bihs}dP9-Hd8DrFv+F#IX~tIo}X99kV7 zzPb>B>f_MA`UV13!60Ar+kt1@n=+F@anuyP4h&?nWk=)zSTUG@EYVSj+3V;wvSc{| zTDr9?&2cSe|2)M?mf8Qsv~gpyogRYKv?(L^wPPW>1h%z=Kbr5#ugqp|Cu`Ld1O=ka;pI+MLGca;`_ zK8Mt|9glbRO{ef`V;8xn+-d;zK+w6jELAb6uXVig-g=b>a^;D>orFG)BfhK_?i+G|slI3kC44J=tqJZs0tN4ZPvl>mDg84yY%B#*v-Z3|X3|KNk{o45H>^ zmwRmTBAaKK?h&zCO;U7+niYCMV3h!yduYT1rv?bZS;Ot!C)l9e`rHCJyjR%TK?A6Dcs`p( z?4*!?3%h6vwKhceVNBa&1FRwl0_U~Rv~|>cWbhzhaqC{Tm8z+P*7MMuszMPMlw#`6em0Go@%6S_^J6g%DH@ED1$ReQ^U2OvQD0d$blQTLKN^-FNM5e%eBhBG4Tu-sI2Z)Q zqiEV9>O63z>RP0DgXWDP1DuGlIn8!@5}PZaJT+ttITWWIbF{eF{oaJ6H2}Mk_*CnS z6?2)<^~^IabvJO8Be{77eA)at8ik>CpJ|uF4caCRv|HcLrlX^2x7D&wNEm*1;w9!f1KZ~15 zajI<^_}vz$4kwpNxBx=9+wnFbSEbVLNQuS>tz>gjCX3ubCkN6mn?hU%?v!RqM(D=3 zH%OYQKhZNm%VDaycJ}AB=(;F}2L2B#Zh&sQZLY0-LD{_R(HMXQ7vjFdozhX;gep@O z_vE&_^WlQb~ZT26N~;R za0WPbXvL}u!!Z{48_YR*K>N-rkhu0l0$%13aN*<^%@*&hd@$CS`)awv3vCB3GQ;vV zc`MQM*ECfo0GIsa%`0d;U6gM>P__uAJUTj5%KjXRDG5`)Zesk^*aw?`9|+_fI+t1d48!CTw_2?GQF<Y1uGOqWCpomN`S28l`iEVqw=ZVq<^=swe?vFm3Bq11Z?RKZEl zW|`>S$;RQ7D-4u=mCHHOQ=PprOUG%dHVib8R5rLDOWaJML8X4Eers#1wZVX20MDef z>an|;6QX_=@dEjW@;PoD#VHvV&%bvQx2&HUR+B|jX+A1*@Dg{Aj<5hT2u;n~fN2+y zJcg6hvYiHr2B9t($SwC+toXAJSJFh$uKQ=SJ(c^& zv6}IhO3FALtgI^7{FfQ@*}mGnH*W-Qk5y>HtTelG0*u7EN;WC3oU7kECo-a^#mr;X z3~6ymR^uHRfx=-fV*6`^Sr{Lk-;bXA8FE5LK6~ViT3mTV@M@ z#{mI6$r01EJr&~2(R&z$kl~!L+H>#=7R`qWLvNJ(Fr5|N7Do6H3sML&^hGm)p zXz{$X7#d8@j6iiwqhrj2lqqDMf3AEi;54qe`%}#B_w}x?-WE{lNPgQvQvt4S&8tI| zL=DBQeS^pbu5J$gMazC#P=dLRhovFQqCQi&GX-2i&RR}Z$a2^t4#FUAM9^#?0J<@8 z5mm^#!Kr9T)0fHbck<}NPUe<_nFyN92lvrbb9ch;@dGB~BSu5j6jH%CjM=09;r4br zUVM8H4$YF*Ptet@!a{a7Or@zV1)~*)@w^^f?Oiy3W(vWk%HArQZK_0O&~-%c3Ux6U zglumJM}|MB>QU5gh5XrcZ!fB>Pr2Vl8Z3m6!-5A$)e}OtHkeubY(!)XhsWt>wqvq3 z<>-(xS%b-T)Ep0%Is3t>mb%{4HhdTi`=$t-_rj@-cD8i?D^%HiadP+#jufHlHG^Qd&(KqsTmK`h#JC5SpIWwK{y6VnnnK^+)P|pHG!t zQJ(q31x&caHE#M*?9qpoF3(~EoO)9C(4m-aLgWm|AGSdtIw0!|m_=uUc(i9%yIEW| zYD@>u!`V1L?A;{=(V{oDh-QE(XTg(VsY|UEW-Tz^Qh6>IK&kFtKB+ zonjEMurpBGn&IqI70C79fAAp&>gSii3|65Z{< z!hPuo+{1DCiXlFj+;^0ed!jcZ=htA#QO{fG$wP@`zvnds9?2zc$L1o@Zygf-V>8f` z#;MX~nI(GCv`qSw%$NlxPs62gGITfOG|Q!KG6n*z9a4Q6`sTq2CaEkPX2DH@Cwg4+ zf<=lr`Z%umy5&=#(r)5!j~+pQag(A*Z`lY`J)EZaY8wJ2b|nzJX8rjX#gX3n7@>}?+K204;$ z>xd%Y=^GvIwutx{c=kpYx{Xt}W5f^PD_u_utP*H28&t11fshJT@&Aj6N7qhDQf($B z|1aW$;*93ts5hm-2lC#44_bhWB&yddFeI5ITujxDzVVFy1qheN3wTg;*UC0x?5XiK>4#_7}p%t>XTa;8wASIH*b{)$mknL_EbB g3=wMW^ypTbijk~r%I(ynsLq3*&l>N-Wg^Lc1Gz;3_W%F@ diff --git a/home/system/wlogout/icons/lock.png b/home/system/wlogout/icons/lock.png deleted file mode 100644 index da59b10e1133cad9b2ff39bfb0e5148fd9d552a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2983 zcmdT`X;c*16@FDz(?ugtEe#UZ>W&ITM*%@W1d68FMnF^;mvLd5umubtD2NUe%_=b1 z4$2~i=}}@55fF_6L8VzWj5;WS8?u@p(+G_*0kMU74aURC;UpRVr(UF{6U$q7rPgJ@ubIR6|Htdm!xY_f~_n!87|e0@xEYf`CYO8I49bpGq!EX7UQzh)wba+ zR%N|;^%mlL+wyCDV)QIm3e^@1%*@Wxyol7WPR}Z_$l=E;FilcA#pzV zt}jVm_xTEYyZ&X2Gt}Gc!6P}qsE#ThuyVV|1d@nuOBQH2Fy=^*tGF^8)I(0QU zTb6!q1SznW_T_PlFRgeJ#(KO`p6J$lLUk%KdDNz|ddktqgkE|;rykMNOulCrR9PJ# z7ZMXWQ}Tz22^EIV{{A$Nz&!X~RD~Pe1<=FojZ0k;bZSu^J7VA~e5l+JzFBcRB$=_E z-mc6cH63+p`?9rFu~2r_Q{e0u|Kw%&yA>aLoDhG?PF{sA1t`KCD}O~#8L6q#m1m;hmBA2*$( zGmV81zTl?gByPgb1fqFR&Q1L%`>(K(3AMZdMx$2uAn5$as6gZ7dBkA;oqLCLolC}t z3F+nHXGN9ljTXqM>8Oy%^6e{d$>bN>mlH3T+});_(MI9DJ zf3#y?x7-olrEi=pTyy?;eKjFOn~iE;>`3X7*yy!7rKNwxys4^9j$Ye0x;?M!m#i^R z^=G*(TAS}h*L3JQ$~dyvH9d%MYlCGAmRa|!V(YH*1K}uEjOW@cr@CFA=2YdD2Wpd# ztfMq7kb#QFt=TsFyo*7DTmNZVjfiVoyHjQ$JG^IlnO?-ASf@?=Oi11w2)Q13eN&q~ z6`^VyR|ullMX0nqss4vI9iSqu6@Z5HqcK@v|JUvm?cf3$O8dGS4a4tqqfA3mnr-?| zSs)^Hqal3+GvM8|GpKaQ2rxXB5RqErw(IB1DL_zBA=x(4LD~0Qy{5B91|}6t9%ic% z03*8Z2)#+V_?7KVw~Q;v0PQ=s6GUf>nFV}B(m?)Pqrj!Tz+Go_B-*Gp*NX-uT@%g- zS4EoLR7v`+ya(;x@Hh}tCW?~>XmDv@(WH^@(w-6Wx6$tCFKchih1fF)3asxGNqOvWEd&GqwNU{1X!~&c{|4xtJNQ=pO4q3lmIbNj|G7=zoBEtS z1Q!YbLyIB;QL_Xf)YGB*Rfxvl1C|L*xG{VuL8`?s=td@)x*6d(0&WgVB1h!0c;rm_ z08_e%eeGqjnh98wCeM%LC4$?!4gI~80u)+`njCjcfU1T|4hP*f3(fE1ni2B zv7bK64-e*lGTo1xeF4926xedkNt*=AsjVb1@Aw9;nc5O_f<7@k<_BB}diOw_A^e7l z^}oBkH-Lo&{C#+Ai<0jgjI*P8xU_BDUULi}9vVaTdn4d@%kbDskVS$Ot(6;RbpsDS zQR+S&m+4b%Ea2qi0WArRUgRs%F<%TRbVzJM%|zg~Vg0uVhYx}m_3lGB&LBAZz0c|` zpXKr1KqX(2tMq(O!s_KHeSfy5gh27Vu^^40CeNstrGmyKMidt#ZoB|lT>3=|)0aT7 gO~92+jjWntK4Oj7R%IN&0sr8Dr>l>kf*&CI5yMTGd;kCd diff --git a/home/system/wlogout/icons/logout.png b/home/system/wlogout/icons/logout.png deleted file mode 100644 index 8a259220a62ee279915cb2fbf8a76a4a31487b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3660 zcmd5;dvJ_d7C-mvN4~uD7x8Ekx&eQtva~CX{ z0}#A*&DJq-=k$S9GbUA)e4f?S5IAJ=fX1Sr`;!k(T<5iK%KTfE4{n6czmdPcT_gR?yAjQnsj}bazg4 z)#T59`!qeeyZl<#k}H?440+gZ;O3py#@-QU?yX-rr7_L4dHS%VFkwLF*x${(b3Wkw z&4SX(m3y@pUz`}XI$`wO8?ue6lSk8C)gvCA5Qb*W9TGMnuwS>d@x{LiyIj!I-epPL zt!0if&S)W6QPuFivAr}RheYt0unPZ~vBHNuX2 zwq1V`t_*0{k=<=1<1Ag9+n9aeDcLnjux#s7a3Z8-f!E&$+cILz+vU!bwcigbDRV|7 zsQ7-%yH=1+oz`9toKsSk{^`856nEjF=4Od3VQKyPxTI~kF7jC)#v1U8zm}*|Cj5A& z#!XAZC9I`?Br>=l9gQB#;>SmOJo4=7t?9J8;n*YqpSXC#*vaX4p53indS_gh=-+I= z?>0^AG3T){sZYbJ=?k6jg(;kihAsKdPPu=$liDfMm$iK{?U5%4Lu$F}jEzlqOK#A6{FOz4xZsbw&<# z)WSiv3U;n&==w+dqZbOkgdj6oq&!lQw{GGjYT{Q=pBxz-CjKyd>HYbXkFdZgcV4Y zU;;%M5=(>XoC00)bUdIa&8s@s6J2@R1)HR}v7x_Ulav!%)0XRWevB%j-ki0wS(^+# zfyXSuD3#J5s?CC=cGH=cQetc(=bq<{1!YE2gzIWxL^s4XaOG~>s4Na5mg!f!ejm$% zYPeeKy4qjLE0kPs)1xja9=yGIAMs{spDBafEsy0Ub8S0KrdB8wyhQIXi_s$fFL07&aAH&X1C8u{#yw!IS4`!QWRf$ zwztEj!`i_j^vm$qOIciTf=$xE1Aw0z;CB6U(lNPQ)-gkPUnCXXlL_@fT_^^1P!hu% zfF`P!<^Tmaf`FfxNf1qfPSOM9fFDnz2H{xE7Q~%6p?Kz;lf9vp5(V&GEJBT;Za`@>rVr|q)Q6ZOy`KcK;29xE8 zw6C64A(O^2K;{3yP0fg891+QK+BFzN4G<)106$R!&x#uKQc=TySf@%||w0>J~s7Vg6(&qSmRkwfjsPb8&g}IQkJ(Ubgt#;U$dFGOq-|aO%YS zJ9>h}HME0Ih+pjssozfv0l;2`9XWW`PHAF#DWZ3R6G=d0cJ z^wEXWBc{COp1wY_DjKYzz+q#Y0hTBxFnV^)m|CnpfvYIeou3QWS`abX5^%ldh4M%N~hjJFS=YLqNn$1!C~n@;(YfuxHEl|2b)f%$$WDGmc79Zx{!7}7SD;Gb++Kyjk!@%^$pmnQ@tUlXB{?C z!RVaEAuXQL4>y zEJr_8q%ncjrg0Dn?0SBvoTyoTBCGw-F(1JtP}f(!N5O)$^WdKBJu6F3Tdf>#5+Cdv z90NNrE=&03EwwN$Gf_r`!1VN$i=RxK^B~~csSI|a)Bq3^DG+#|+>9s?H-*k7;j|Cgq%yet z`X4#32Vr-}@bfOmWtH*=gCX(GOzSgz#AkqXutiQ=UEzMvQ%M}QAi$QFub_zDv=zCSTcJ#slV-Q0ZFEjI+~AIOD1K2T2`Q!8KHd!~30LJR|_xzY#hqWSFY zd##GcAw>EfHP7?~djOOXb{uc<<xv8|x%`A7uvICu%9ae=)SATBQfI+y@_ldJYl7t2Ivao{5h-?AO2KS7Zro XozeZ!hS_t6Q=0hb1jErtW9B~r%&1|! diff --git a/home/system/wlogout/icons/reboot.png b/home/system/wlogout/icons/reboot.png deleted file mode 100644 index e5fd221a9c500a324ecffd921e18309db45eade2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3957 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 u{}KBqx@M&pESmdT1x5DuWAXfbub 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 rO~qnnl5T``QYZliqa><(dQaOWm#UD+aTtF9.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/hosts/server/home.nix b/hosts/server/home.nix deleted file mode 100644 index eb238b8..0000000 --- a/hosts/server/home.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ pkgs, config, ... }: { - - imports = [ - ./variables.nix - - # Programs - ../../home/programs/btop - ../../home/programs/nvim - ../../home/programs/git - ../../home/programs/shell - - # Scripts - ../../home/scripts # All scripts - ]; - - home = { - inherit (config.var) username; - inherit (config.var) homeDirectory; - - packages = with pkgs; [ - # Dev - go - cargo - nodejs - python3 - jq - - # Utils - fd - bc - gcc - zip - unzip - wget - curl - glow - wireguard-tools - pfetch - ]; - - stateVersion = "24.05"; - }; - - programs.home-manager.enable = true; -} diff --git a/hosts/server/modules/exposed/bitcoin-git.nix b/hosts/server/modules/exposed/bitcoin-git.nix deleted file mode 100644 index d80bf5b..0000000 --- a/hosts/server/modules/exposed/bitcoin-git.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, ... }: -let - bitcoin-price = pkgs.writeShellScriptBin "bitcoin-price" '' - [ ! -d "/home/hadi/btcprice" ] && ${pkgs.git}/bin/git clone git@github.com:anotherhadi/btcprice /home/hadi/btcprice - cd "/home/hadi/btcprice" - price=$(${pkgs.curl}/bin/curl eur.rate.sx/1BTC) - echo "# Bitcoin Price in EURO" >README.md - echo "" >>README.md - echo "1 Bitcoin = $price€" >>README.md - echo "" >>README.md - echo "Date: $(date)" >>README.md - ${pkgs.git}/bin/git add . - ${pkgs.git}/bin/git commit -m "Update price (hadi)" - ${pkgs.git}/bin/git push -u origin main - ''; -in { - systemd.timers."bitcoin-git" = { - wantedBy = [ "timers.target" ]; - timerConfig = { - Unit = "bitcoin-git.service"; - OnCalendar = "daily"; - Persistent = true; - }; - }; - - systemd.services."bitcoin-git" = { - script = '' - ${bitcoin-price} - exit 0 - ''; - serviceConfig = { - Type = "oneshot"; - User = "hadi"; - }; - }; -} diff --git a/hosts/server/modules/exposed/cloudflare-dyndns.nix b/hosts/server/modules/exposed/cloudflare-dyndns.nix deleted file mode 100644 index 5df48b0..0000000 --- a/hosts/server/modules/exposed/cloudflare-dyndns.nix +++ /dev/null @@ -1,20 +0,0 @@ -# CloudFlare Dynamic DNS client -{ - services.cloudflare-dyndns = { - enable = true; - ipv4 = true; - domains = [ - "cloud.anotherhadi.com" - "vault.anotherhadi.com" - "anotherhadi.com" - "www.anotherhadi.com" - "jack.anotherhadi.com" - "ntfy.anotherhadi.com" - "home.anotherhadi.com" - "kuma.anotherhadi.com" - "media.anotherhadi.com" - ]; - proxied = true; - apiTokenFile = "/etc/cloudflare/apiToken"; - }; -} diff --git a/hosts/server/modules/exposed/kuma.nix b/hosts/server/modules/exposed/kuma.nix deleted file mode 100644 index df6513a..0000000 --- a/hosts/server/modules/exposed/kuma.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - services.uptime-kuma = { - enable = true; - settings = { - HOST = "127.0.0.1"; - PORT = "3005"; - }; - }; - services.nginx.virtualHosts."kuma.anotherhadi.com" = { - enableACME = true; - locations."/" = { proxyPass = "http://127.0.0.1:3005"; }; - }; - networking.firewall.allowedTCPPorts = [ 3005 ]; -} diff --git a/hosts/server/modules/exposed/nextcloud.nix b/hosts/server/modules/exposed/nextcloud.nix deleted file mode 100644 index 7bdf365..0000000 --- a/hosts/server/modules/exposed/nextcloud.nix +++ /dev/null @@ -1,28 +0,0 @@ -# Nextcloud -{ config, ... }: -let hostname = "cloud.anotherhadi.com"; -in { - services.nextcloud = { - enable = true; - hostName = hostname; - https = true; - config = { - adminuser = "jack"; - adminpassFile = "/etc/nextcloud/adminpassFile"; - }; - settings = { - trusted_domains = - [ "localhost" "127.0.0.1" "192.168.1.99" "cloud.anotherhadi.com" ]; - }; - nginx.recommendedHttpHeaders = true; - extraApps = { - inherit (config.services.nextcloud.package.packages.apps) - contacts calendar tasks notes; - }; - extraAppsEnable = true; - }; - services.nginx.virtualHosts.${hostname} = { - forceSSL = false; - enableACME = true; - }; -} diff --git a/hosts/server/modules/exposed/nginx.nix b/hosts/server/modules/exposed/nginx.nix deleted file mode 100644 index 524884d..0000000 --- a/hosts/server/modules/exposed/nginx.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Nginx Reverse Proxy & ACME certs -{ config, ... }: { - services.nginx.enable = true; - security.acme = { - acceptTerms = true; - defaults.email = config.var.git.email; - }; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - -} diff --git a/hosts/server/modules/exposed/ntfy-sh.nix b/hosts/server/modules/exposed/ntfy-sh.nix deleted file mode 100644 index 6238b11..0000000 --- a/hosts/server/modules/exposed/ntfy-sh.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Push Notification Server -# https://mynixos.com/nixpkgs/options/services.ntfy-sh -let - hostname = "ntfy.anotherhadi.com"; - port = 8082; - url = "https://" + hostname; -in { - services.ntfy-sh = { - enable = true; - settings = { - base-url = url; - listen-http = "127.0.0.1:${toString port}"; - behind-proxy = true; - }; - }; - services.nginx.virtualHosts.${hostname} = { - enableACME = true; - locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; }; - }; - networking.firewall.allowedTCPPorts = [ port ]; -} diff --git a/hosts/server/modules/exposed/tailscale.nix b/hosts/server/modules/exposed/tailscale.nix deleted file mode 100644 index 42661ee..0000000 --- a/hosts/server/modules/exposed/tailscale.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: { - services.tailscale = { - enable = config.var.tailscale; - useRoutingFeatures = "both"; - authKeyFile = "/etc/tailscale/authKey"; - openFirewall = true; - extraUpFlags = [ "--advertise-exit-node" ]; - }; - - # Fix DNS & IPv6 bugs - networking.nftables.enable = true; - # services.resolved.enable = true; -} diff --git a/hosts/server/modules/exposed/vaultwarden.nix b/hosts/server/modules/exposed/vaultwarden.nix deleted file mode 100644 index 9ca0c3c..0000000 --- a/hosts/server/modules/exposed/vaultwarden.nix +++ /dev/null @@ -1,22 +0,0 @@ -# Password manager -let - hostname = "vault.anotherhadi.com"; - url = "https://" + hostname; - port = 8222; -in { - services.vaultwarden = { - enable = true; - config = { - DOMAIN = url; - SIGNUPS_ALLOWED = false; - ROCKET_ADDRESS = "127.0.0.1"; - ROCKET_PORT = port; - ROCKET_LOG = "critical"; - }; - }; - services.nginx.virtualHosts.${hostname} = { - enableACME = true; - locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; }; - }; - networking.firewall.allowedTCPPorts = [ port ]; -} diff --git a/hosts/server/modules/internal/adguard.nix b/hosts/server/modules/internal/adguard.nix deleted file mode 100644 index 1a524bc..0000000 --- a/hosts/server/modules/internal/adguard.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Network-wide ads & trackers blocking DNS server -# Change your router primary DNS server to {this server IP} to make it network wide. -{ - services.adguardhome = { - enable = true; - host = "0.0.0.0"; - port = 3000; - allowDHCP = true; - openFirewall = true; - }; - networking.firewall.allowedTCPPorts = [ 53 3000 3001 ]; -} diff --git a/hosts/server/modules/internal/cockpit.nix b/hosts/server/modules/internal/cockpit.nix deleted file mode 100644 index b6798a6..0000000 --- a/hosts/server/modules/internal/cockpit.nix +++ /dev/null @@ -1,15 +0,0 @@ -# Web-based graphical interface for servers -{ pkgs, ... }: { - services.cockpit = { - enable = true; - port = 3009; - openFirewall = true; - settings.WebService = { AllowUnencrypted = true; }; - }; - - environment.systemPackages = with pkgs; [ - networkmanagerapplet - selinux-python - cockpit - ]; -} diff --git a/hosts/server/modules/internal/openssh.nix b/hosts/server/modules/internal/openssh.nix deleted file mode 100644 index e3a1b68..0000000 --- a/hosts/server/modules/internal/openssh.nix +++ /dev/null @@ -1,18 +0,0 @@ -# SSH server -{ config, ... }: { - services.openssh = { - enable = true; - ports = [ 22 ]; - settings = { - PasswordAuthentication = true; - AllowUsers = [ - config.var.username - ]; # "null" allows all users by default. Can be [ "user1" "user2" ] - UseDns = true; - X11Forwarding = false; - PermitRootLogin = - "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no" - }; - }; - networking.firewall.allowedTCPPorts = [ 22 ]; -} diff --git a/hosts/server/modules/internal/security.nix b/hosts/server/modules/internal/security.nix deleted file mode 100644 index c84ac1f..0000000 --- a/hosts/server/modules/internal/security.nix +++ /dev/null @@ -1,8 +0,0 @@ -# Firewall & fail2ban -{ - networking.firewall.enable = true; - services.fail2ban = { - enable = true; - maxretry = 5; - }; -} \ No newline at end of file diff --git a/hosts/server/modules/jackflix/default.nix b/hosts/server/modules/jackflix/default.nix deleted file mode 100644 index f7a69a5..0000000 --- a/hosts/server/modules/jackflix/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -let - exposed = false; # Expose jellyfin to the internet - - vpn = { - enable = true; - wg-config = "/etc/wireguard/wg0.conf"; - }; - - root_folder = "/data"; -in { - systemd.tmpfiles.rules = [ - "d ${root_folder} 0755 nixarr nixarr" - "d ${root_folder}/media 0755 nixarr nixarr" - "d ${root_folder}/media/shows 0755 nixarr nixarr" - "d ${root_folder}/media/movies 0755 nixarr nixarr" - "d ${root_folder}/radarr 0755 nixarr nixarr" - "d ${root_folder}/sonarr 0755 nixarr nixarr" - "d ${root_folder}/jellyfin 0755 nixarr nixarr" - "d ${root_folder}/bazarr 0755 nixarr nixarr" - "d ${root_folder}/transmission 0755 nixarr nixarr" - "d ${root_folder}/completed 0755 nixarr nixarr" - "d ${root_folder}/incomplete 0755 nixarr nixarr" - ]; - - users = { - groups.nixarr = { }; - users.nixarr = { - isNormalUser = true; - group = "nixarr"; - extraGroups = [ "docker" ]; - hashedPassword = - "$y$j9T$9.hOJCwwmryq3PzEOGtjZ.$hu/76TghEjongcbls7oDoN2GWRqg8AwCknq.CS0zB.8"; - }; - }; - - systemd.services.jellyfin.serviceConfig.IOSchedulingPriority = 0; - - services = { - jellyfin = { - enable = true; - user = "nixarr"; - group = "nixarr"; - openFirewall = true; - dataDir = "${root_folder}/jellyfin"; - }; - - jellyseerr = { - enable = true; - port = 5055; - openFirewall = true; - }; - - prowlarr = { - enable = true; - openFirewall = true; - }; - - radarr = { - enable = true; - user = "nixarr"; - group = "nixarr"; - dataDir = "${root_folder}/radarr"; - openFirewall = true; - }; - - sonarr = { - enable = true; - user = "nixarr"; - group = "nixarr"; - dataDir = "${root_folder}/sonarr"; - openFirewall = true; - }; - - bazarr = { - enable = true; - user = "nixarr"; - group = "nixarr"; - openFirewall = true; - }; - }; - - # Transmission port - networking.firewall.allowedTCPPorts = [ 9091 ]; -} diff --git a/hosts/server/modules/jackflix/transmission.nix b/hosts/server/modules/jackflix/transmission.nix deleted file mode 100644 index b1738a4..0000000 --- a/hosts/server/modules/jackflix/transmission.nix +++ /dev/null @@ -1,21 +0,0 @@ -# I'm using the transmission-openvpn docker image to be sure that my torrent traffic is going through a VPN. -# Only to download legal stuff of course. -{ - # environment.etc."/etc/transmission.sh" = { - # text = '' - # docker run --cap-add=NET_ADMIN -d \ - # -v /var/lib/transmission-openvpn/data:/data \ - # -v /var/lib/transmission-openvpn/config:/config \ - # -e OPENVPN_PROVIDER=PIA \ - # -e OPENVPN_CONFIG=france \ - # -e OPENVPN_USERNAME=username\ - # -e OPENVPN_PASSWORD="password" \ - # -e LOCAL_NETWORK=192.168.2.0/24 \ - # --log-driver json-file \ - # --log-opt max-size=10m \ - # -p 9091:9091 \ - # haugene/transmission-openvpn - # ''; - # }; - -} diff --git a/hosts/server/modules/www/anotherhadi.com.nix b/hosts/server/modules/www/anotherhadi.com.nix deleted file mode 100644 index 45ad08b..0000000 --- a/hosts/server/modules/www/anotherhadi.com.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ inputs, pkgs, ... }: { - services.nginx.virtualHosts."anotherhadi.com" = { - serverAliases = [ "www.anotherhadi.com" ]; - enableACME = true; - root = inputs.anotherhadi-portfolio.packages."${pkgs.system}".default; - }; -} diff --git a/hosts/server/modules/www/default.nix b/hosts/server/modules/www/default.nix deleted file mode 100644 index 326ee69..0000000 --- a/hosts/server/modules/www/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ ./home.anotherhadi.com.nix ./anotherhadi.com.nix ]; - - services.nginx.virtualHosts = { - # "test.anotherhadi.com" = { root = "/var/www/test"; }; - }; -} diff --git a/hosts/server/modules/www/home.anotherhadi.com.nix b/hosts/server/modules/www/home.anotherhadi.com.nix deleted file mode 100644 index 636a07e..0000000 --- a/hosts/server/modules/www/home.anotherhadi.com.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ pkgs, config, ... }: -let - settings = '' - { - "config": { - "title" : "Jack's Home", - "openLinksInNewTab": false, - "locale": "fr-FR", - "colors": { - "primary": "#${config.var.theme.colors.accent}", - "background": "#${config.var.theme.colors.bg}", - "foreground": "#${config.var.theme.colors.fg}", - "muted": "#${config.var.theme.colors.c8}" - }, - "folders": [ - { - "name": " Home", - "links": [ - { - "title": "Nextcloud", - "url": "https://cloud.anotherhadi.com", - "icon": "󰅟" - }, - { - "title": "Vaultwarden", - "url": "https://vault.anotherhadi.com", - "icon": "" - } - ] - }, - { - "name": "󰚺 Streaming", - "links": [ - { - "title": "Jellyfin", - "url": "http://192.168.1.99:8096", - "icon": "󰼂" - }, - { - "title": "Jellyseerr", - "url": "http://192.168.1.99:5055", - "icon": "" - }, - { - "title": "Radarr", - "url": "http://192.168.1.99:7878", - "icon": "" - }, - { - "title": "Sonarr", - "url": "http://192.168.1.99:8989", - "icon": "" - }, - { - "title": "Bazarr", - "url": "http://192.168.1.99:6767", - "icon": "󰨖" - }, - { - "title": "Transmission", - "url": "http://192.168.1.99:9091", - "icon": "󰘡" - }, - { - "title": "Prowlarr", - "url": "http://192.168.1.99:9696", - "icon": "󱖫" - } - ] - }, - { - "name": " Admin", - "links": [ - { - "title": "Uptime Kuma", - "url": "https://kuma.anotherhadi.com", - "icon": "󱎫" - }, - { - "title": "Cockpit", - "url": "https://jack:3009", - "icon": "" - }, - { - "title": "Adguard Home", - "url": "http://192.168.2.24:3001", - "icon": "" - }, - { - "title": "Proxmox", - "url": "https://192.168.2.17:8006", - "icon": "" - }, - { - "title": "Cloudflare", - "url": "https://dash.cloudflare.com/", - "icon": "" - }, - { - "title": "Tailscale", - "url": "https://login.tailscale.com/admin/machines", - "icon": "󰖂" - } - ] - } - ] - } - } - ''; - - package = pkgs.buildNpmPackage { - pname = "homepage"; - version = "0.0.0"; - - src = pkgs.fetchFromGitHub { - owner = "anotherhadi"; - repo = "homepage"; - rev = "9553fc10221eb8568ca6999d73e48e9261447aa4"; - hash = "sha256-vpiaBb0iDnbYQH69ZbMurHtOerWNPX7HC7Hx0vM31C4="; - }; - - # npmDepsHash = lib.fakeHash; - npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4="; - - buildPhase = '' - npm install - cp ${ - pkgs.writeText "src/routes/config.json" settings - } src/routes/config.json - npm run build - mkdir $out - mv build $out - ''; - - meta = { - description = "homepage"; - homepage = "https://github.com/anotherhadi/homepage"; - }; - }; - -in { - services.nginx.virtualHosts."home.anotherhadi.com" = { - serverAliases = [ "jack.anotherhadi.com" ]; - enableACME = true; - root = package + "/build"; - }; -} diff --git a/hosts/server/secrets/default.nix b/hosts/server/secrets/default.nix deleted file mode 100644 index d5153f0..0000000 --- a/hosts/server/secrets/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - - sops = { - age.keyFile = "/home/hadi/.config/sops/age/keys.txt"; - defaultSopsFile = ./secrets.yaml; - defaultSopsFormat = "yaml"; - secrets = { - sshconfig = { - path = "/home/hadi/.ssh/config"; - owner = "hadi"; - }; - github-key = { - path = "/home/hadi/.ssh/github"; - owner = "hadi"; - }; - nextcloud-adminpass = { - mode = "0444"; - path = "/etc/nextcloud/adminpassFile"; - }; - cloudflare-apitoken = { - mode = "0444"; - path = "/etc/cloudflare/apiToken"; - }; - tailscaled-authKey = { - mode = "0444"; - path = "/etc/tailscale/authKey"; - }; - transmission-script = { - mode = "0755"; - path = "/data/transmission-script.sh"; - owner = "nixarr"; - }; - pia-wg = { - mode = "0755"; - path = "/data/.secret/wg.conf"; - }; - }; - }; -} diff --git a/hosts/server/secrets/secrets.yaml b/hosts/server/secrets/secrets.yaml deleted file mode 100644 index af18783..0000000 --- a/hosts/server/secrets/secrets.yaml +++ /dev/null @@ -1,27 +0,0 @@ -sshconfig: ENC[AES256_GCM,data:4js0EtQXcazsMDoF3LFmEqvDSxviZFTLtmyd0XgS4PTcf7exHj586EqxJRMQuT318PyPH+KzYU5XV1OwnZl8c5G0ZSivj2AJewAPe0JtByqrBA6xEiozDGP8s8YezELZs2MebVHHWxzn+g/HsJM3QFoR3g==,iv:l1pS/K2GHNJ8aztgYGvtksP3QR4qqhIDRLiWg6dwGzc=,tag:adAmwETO0gmeC0jGGkFSmg==,type:str] -github-key: ENC[AES256_GCM,data:6u7+Rq+FYhYvfHoCNeQ2zKHVzsw9gbsFcoEcEMHc5gDenLwjTBTvY5TroIY5X8SvDh656N8WsOTIYGqbRyNY1bnCsMt9Q6rlanIlc1BGp77bctztImp0KKbMctDDvG+6FVqvdmO5gwO1+lUB/uX4Sb6DeFGrizDyhoKZlTrA7GHnYh4prryimlSnlwzhXTtpqQ7fzyniNShXlJPgQfGB7Z3LJCmMEUs4CHVRuuIIgRm/wk5muhJmynKsuB8l0tSqVDaNQjTrxE95p021ivCiEHWULf6+Z31u5tTG+yps2y5kpSP08Op9mk1aB7Wrcg/vh52wWvedpTuqLSeJCzxbLWrmeMq8d9J402ZH8jgI2WfqgWHdHotODrD12n5nA5b6gnoQ7N793FuQPKu4YfMbCvZN5gdzNrfmAuAaSCTq1XTr4z8As81LIZxbj22uyRSEvZM6biqVZOIk7I0FZMN2BnWVZLYOoC+fyeedh/I1ZqYWuvswCUBowrVJ875eo+/+2JEcRiXIGcLFsuPsbw8R,iv:gv6qb91ZvkOIT6QuQZvLuotxGaBv1nK8ytagDWtiWBQ=,tag:2tXUNGiA/5xhxCXC5v4D3w==,type:str] -nextcloud-adminpass: ENC[AES256_GCM,data:skcJhRBDDAIqdrUkylqntJE7ErG+4jWAcw==,iv:gf49orzxxyr+CAYCHQwvHCE6IcaR3iCu4blfn/HFzlc=,tag:b7R4Y8GSKAqoZuUBLPj2AQ==,type:str] -cloudflare-apitoken: ENC[AES256_GCM,data:VVMa84UpCFcUSFVdnBt4mVTnm5rGDJBtw0nEm6584mDcVT35Ycc8LyhHJofQRNQQPviDKgmjgt9Tv7ZgRg==,iv:fVC2cWfveeACJ0x+weKzv0bQZGucfwZi5rq2RiDJgsY=,tag:uCN/IKaFbqQaDoA+M704sw==,type:str] -tailscaled-authKey: ENC[AES256_GCM,data:wIFPKLoD2BDgBjBmOSx2a5okN8BWFdEqApXD4QeVA9uxXBSBhfPu+57dh4O0gTH77n0RgbhxJ/TCorTtNg==,iv:ue/MeYAhUcG69p2Vw5drGdGxkRC8ofzzE910nZd2JKk=,tag:xKjlIpi8WHWT57ryWtUnlg==,type:str] -transmission-script: ENC[AES256_GCM,data:W5GaHfc1Grmzu2a48FkVTaPj3FUB6qWamdFIzaxPhmJoiA6F8T4sUwN6tRaP5YDCX+svdzceOTg6f63RfoSv5Vwq56Lmew6+MJi/GE4D70E4PkWBxyO6DJ+Pq/XtgsVyh+98U7n10oUoDMei8gTf0Fx8VgHSzs+KjsaQsgY2MDdHasl2Kk+cZn1jfLdPPH8NHV8zwnpCl95+acugXzMMZR+rwl+dGLlESmmHj1O9FVWo33kyv/3kEW7ByHByv/TP7Lh+3aYxBeTBAQ/DgK3lpLSINwifTXkXNSao+RuzFXW+7l29qz64mgcqwDerFWXM5IyLnnkt/Nh4+B9FEYgGpyq+cs9HSpgk5ifwx7RvGf/Gmhxj6wynv3Oa2h9ezYGVHZwuOJeuZVjbOSiVfo9i7/l2PZkl5EFbD90gUMHNl7GLuTW0+h+bYxMkfTMOrQQDx0t9c/kFvsd4nxhkIvB+f0kQzlLM3/LvN+6NTwg2P8JtLs52hVT2nP9FkIo9g7IyB5LiNvZc9vwJm2Jmow==,iv:J7HYpaqzAktdFx/wOx3q11l3aLoAQ6DbI6/zM8hwpJs=,tag:qW59BNzCbIu2it2hL3AZyg==,type:str] -pia-wg: ENC[AES256_GCM,data:zJuAQa5joQUwMppaffHTbmLS7y+c3usOjjNpSGSMolGVIp81mr+5ccqLOqtb1Ox0L1/VdIJifRCSk/WGZYXVN2yLb4Ndw6vbRzrLwML3lFfOC4p2zDVraJIkPxSyGA3gb3yvAoNTzhnTyLaZnFdwxAq6bZqlCq/Ey9VVDvMFSssmW8oaWmFJSjtbyhUwnygMsoInmz6MTptAmtmzSuBVuWeFo2VfkT26alkIBtTCN3o3/5xTr5htvsMoyr5B3+ut0t+1FN+k/ntohi/QzxNcWznm2OUOyhV4fkjBxFcDhLiM+eb7gD1ZPFAyXZ2v+XY4+R/OGdwhEfr0+60pIl9gC9ukpVY504r8Cw==,iv:bK5XE7oJh2EIsprEwdtvyVuMfg+opUkC2QkzazejNTI=,tag:dkQFA0PhqXCKeybnTsLdqQ==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVWN4YjZqczB3Q21WL1lz - ckROWkhRditHblVHVEpOS0E0aGVqdW14M0ZvCkNzRXlCOWFBWmQwTGpTYVdFRlpq - bFdOR2pSTEZpUVpvUHo2NklrQm5EU1kKLS0tIFZ5ZWhYcHg1Z0hTOTZIdHR1QUxv - cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo - FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-23T09:28:13Z" - mac: ENC[AES256_GCM,data:qP/YVCjBE2E8pNPIhEgozwUmImH7knlWNzcV25ch6BQDVWN0K9wChm6lPxKuckdX5LG/txO1zCi8NJjDy3Ku6iZ9VqA2oA8TyTQQkg3X8jxXCqL+onrI/oag/lohy3a3ElDWlwowaHxw58hXRxl9uMWQiL2boPJyXjo7mZ5Czgg=,iv:LJ7YU8vnYxRuY+T+HlKlWGH+VvA7ZtP6W/JysIWeC/Q=,tag:kLNqVX6sYVESZz56lDZjrQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.0 diff --git a/hosts/server/variables.nix b/hosts/server/variables.nix deleted file mode 100644 index 2fd8f2c..0000000 --- a/hosts/server/variables.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, ... }: { - imports = [ ../modules/variables-config.nix ]; - - config.var = { - hostname = "jack"; - username = "hadi"; - homeDirectory = "/home/" + config.var.username; - configDirectory = config.var.homeDirectory + "/.config/nixos"; - - keyboardLayout = "fr"; - - timeZone = "Europe/Paris"; - defaultLocale = "en_US.UTF-8"; - extraLocale = "fr_FR.UTF-8"; - - git = { - username = "Hadi"; - email = "112569860+anotherhadi@users.noreply.github.com"; - }; - - autoUpgrade = false; - autoGarbageCollector = false; - sops = true; - tailscale = true; - - usbguard = false; - usbguardRules = ""; - - sshPublicKey = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG9SE80ZyBcXZK/f5ypSKudaM5Jo3XtQikCnGo0jI5E hadi@nixy"; - - theme = import ../themes/windows.nix; - }; -} diff --git a/hosts/themes/nixy.nix b/hosts/themes/nixy.nix deleted file mode 100644 index 94664b0..0000000 --- a/hosts/themes/nixy.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - wallpaper = "the-road-black.png"; - - font = "SFProDisplay Nerd Font"; - font-mono = "MesloLGM Nerd Font Mono"; - font-size = 14; - - rounding = 15; - gaps-in = 10; - gaps-out = 10 * 2; - active-opacity = 1; - inactive-opacity = 0.89; - blur = true; - border-size = 3; - animation-speed = "fast"; # "fast" | "medium" | "slow" - fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - transparent = true; - floating = true; - font-size = 16; - }; - - colors = { - c0 = "1e1e2e"; # black - c1 = "f38ba8"; # red - c2 = "a6e3a1"; # green - c3 = "fab387"; # yellow - c4 = "89b4fa"; # blue - c5 = "A594FD"; # magenta - c6 = "74c7ec"; # cyan - c7 = "cdd6f4"; # white - c8 = "313244"; # bright black - c9 = "eba0ac"; # bright red - c10 = "94e2d5"; # bright green - c11 = "f9e2af"; # bright yellow - c12 = "b4befe"; # bright blue - c13 = "f5c2e7"; # bright magenta - c14 = "94e2d5"; # bright cyan - c15 = "bac2de"; # bright white - - bg = "0B0B0B"; - fg = "EAF0F5"; - bgalt = "121212"; - fgalt = "EAF0F5"; - - accent = "A594FD"; - accentFg = "0B0B0B"; - accentalt = "917FF0"; - - # Should make those automtic - accentName = "magenta"; - accentNumber = "5"; - }; -} diff --git a/hosts/themes/windows.nix b/hosts/themes/windows.nix deleted file mode 100644 index 159905b..0000000 --- a/hosts/themes/windows.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - wallpaper = "moutains_black.png"; - - font = "SFProDisplay Nerd Font"; - font-mono = "FiraCode Nerd Font Mono"; - font-size = 14; - - rounding = 10; - gaps-in = 6; - gaps-out = 6 * 2; - active-opacity = 0.95; - inactive-opacity = 0.9; - blur = true; - border-size = 1; - animation-speed = "medium"; # "fast" | "medium" | "slow" - fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - transparent = false; - floating = false; - font-size = 16; - }; - - colors = { - c0 = "1e1e2e"; # black - c1 = "f38ba8"; # red - c2 = "a6e3a1"; # green - c3 = "fab387"; # yellow - c4 = "89b4fa"; # blue - c5 = "A594FD"; # magenta - c6 = "74c7ec"; # cyan - c7 = "cdd6f4"; # white - c8 = "313244"; # bright black - c9 = "eba0ac"; # bright red - c10 = "94e2d5"; # bright green - c11 = "f9e2af"; # bright yellow - c12 = "b4befe"; # bright blue - c13 = "f5c2e7"; # bright magenta - c14 = "94e2d5"; # bright cyan - c15 = "bac2de"; # bright white - - bg = "0B0B1B"; - fg = "EAF0F5"; - bgalt = "121222"; - fgalt = "EAF0F5"; - - accent = "74c7ec"; - accentFg = "1E1E2E"; - accentalt = "94e2d5"; - - # Should make those automtic - accentName = "cyan"; - accentNumber = "6"; - }; -} diff --git a/hosts/modules/audio.nix b/nixos/audio.nix similarity index 100% rename from hosts/modules/audio.nix rename to nixos/audio.nix diff --git a/hosts/modules/auto-upgrade.nix b/nixos/auto-upgrade.nix similarity index 100% rename from hosts/modules/auto-upgrade.nix rename to nixos/auto-upgrade.nix diff --git a/hosts/modules/bluetooth.nix b/nixos/bluetooth.nix similarity index 100% rename from hosts/modules/bluetooth.nix rename to nixos/bluetooth.nix diff --git a/hosts/modules/fonts.nix b/nixos/fonts.nix similarity index 84% rename from hosts/modules/fonts.nix rename to nixos/fonts.nix index 02b26cd..b8b2508 100644 --- a/hosts/modules/fonts.nix +++ b/nixos/fonts.nix @@ -2,28 +2,23 @@ fonts = { packages = with pkgs; [ - material-icons - material-design-icons roboto work-sans comic-neue source-sans - twemoji-color-font comfortaa inter lato lexend jost dejavu_fonts - iosevka-bin noto-fonts noto-fonts-cjk noto-fonts-emoji - jetbrains-mono (nerdfonts.override { fonts = [ "FiraCode" "Meslo" ]; }) - inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd - inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd openmoji-color + twemoji-color-font + inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd ]; enableDefaultPackages = false; diff --git a/hosts/modules/home-manager.nix b/nixos/home-manager.nix similarity index 100% rename from hosts/modules/home-manager.nix rename to nixos/home-manager.nix diff --git a/hosts/modules/network-manager.nix b/nixos/network-manager.nix similarity index 100% rename from hosts/modules/network-manager.nix rename to nixos/network-manager.nix diff --git a/hosts/modules/nix.nix b/nixos/nix.nix similarity index 100% rename from hosts/modules/nix.nix rename to nixos/nix.nix diff --git a/hosts/modules/nvidia.nix b/nixos/nvidia.nix similarity index 100% rename from hosts/modules/nvidia.nix rename to nixos/nvidia.nix diff --git a/hosts/modules/prime.nix b/nixos/prime.nix similarity index 100% rename from hosts/modules/prime.nix rename to nixos/prime.nix diff --git a/hosts/modules/systemd-boot.nix b/nixos/systemd-boot.nix similarity index 54% rename from hosts/modules/systemd-boot.nix rename to nixos/systemd-boot.nix index 752e44f..a094315 100644 --- a/hosts/modules/systemd-boot.nix +++ b/nixos/systemd-boot.nix @@ -1,9 +1,11 @@ { pkgs, ... }: { boot = { - loader.efi.canTouchEfiVariables = true; - loader.systemd-boot = { - enable = true; - consoleMode = "auto"; + loader = { + efi.canTouchEfiVariables = true; + systemd-boot = { + enable = true; + consoleMode = "auto"; + }; }; tmp.cleanOnBoot = true; kernelPackages = diff --git a/hosts/modules/timezone.nix b/nixos/timezone.nix similarity index 100% rename from hosts/modules/timezone.nix rename to nixos/timezone.nix diff --git a/hosts/modules/tuigreet.nix b/nixos/tuigreet.nix similarity index 100% rename from hosts/modules/tuigreet.nix rename to nixos/tuigreet.nix diff --git a/hosts/modules/users.nix b/nixos/users.nix similarity index 89% rename from hosts/modules/users.nix rename to nixos/users.nix index 63a11c1..17539fb 100644 --- a/hosts/modules/users.nix +++ b/nixos/users.nix @@ -1,4 +1,5 @@ { config, pkgs, ... }: { + programs.zsh.enable = true; users = { defaultUserShell = pkgs.zsh; users.${config.var.username} = { diff --git a/hosts/modules/utils.nix b/nixos/utils.nix similarity index 91% rename from hosts/modules/utils.nix rename to nixos/utils.nix index d74bd52..f36c7b5 100644 --- a/hosts/modules/utils.nix +++ b/nixos/utils.nix @@ -22,7 +22,10 @@ programs.dconf.enable = true; services = { dbus.enable = true; + gvfs.enable = true; upower.enable = true; + power-profiles-daemon.enable = true; + udisks2.enable = true; }; # Faster rebuilding diff --git a/hosts/modules/variables-config.nix b/nixos/variables-config.nix similarity index 100% rename from hosts/modules/variables-config.nix rename to nixos/variables-config.nix diff --git a/hosts/modules/xorg.nix b/nixos/xdg-portal.nix similarity index 100% rename from hosts/modules/xorg.nix rename to nixos/xdg-portal.nix diff --git a/themes/nixy.nix b/themes/nixy.nix new file mode 100644 index 0000000..6e2d053 --- /dev/null +++ b/themes/nixy.nix @@ -0,0 +1,62 @@ +{ pkgs, inputs, ... }: { + stylix = { + enable = true; + + # Edited catppuccin + base16Scheme = { + base00 = "0b0b0b"; # Default Background + base01 = + "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks) + base02 = "313244"; # Selection Background + base03 = "45475a"; # Comments, Invisibles, Line Highlighting + base04 = "585b70"; # Dark Foreground (Used for status bars) + base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators + base06 = "f5e0dc"; # Light Foreground (Not often used) + base07 = "b4befe"; # Light Background (Not often used) + base08 = + "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted + base09 = + "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url + base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background + base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted + base0C = + "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes + base0D = + "A594FD"; # Functions, Methods, Attribute IDs, Headings, Accent color + base0E = + "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed + base0F = + "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. + }; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 24; + }; + + fonts = { + monospace = { + package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + name = "JetBrains Mono Nerd Font"; + }; + sansSerif = { + package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; + name = "SFProDisplay Nerd Font"; + }; + serif = { + package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; + name = "SFProDisplay Nerd Font"; + }; + }; + + # targets.nixvim.transparentBackground = { + # main = true; + # signColumn = true; + # }; + + polarity = "dark"; + image = ../home/wallpapers/nix.png; + }; + +}