From 18c30e5931125692407a60f3bf6bbb5234a2760f 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 Former-commit-id: 905cc9a88553a14246830d12aa5082bb3b2bedb3 --- 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 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 O`_9wV&t;ucLK6VPO_+QD 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 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 diff --git a/home/system/wlogout/icons/suspend.png b/home/system/wlogout/icons/suspend.png deleted file mode 100644 index af099b9c9f95dc8a7bbe81eebe21badd83719cff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4510 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 U{Xv+K6sTM8>FVdQ&MBb@07Q;M1& diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 405d5a8..ed6da87 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,64 +1,29 @@ -{ config, pkgs, ... }: { +{ config, ... }: { imports = [ - ../modules/fonts.nix - ../modules/nvidia.nix - ../modules/prime.nix - ../modules/xorg.nix - ../modules/zsh.nix - ../modules/tuigreet.nix - ../modules/auto-upgrade.nix - ../modules/timezone.nix - ../modules/usb.nix - # ../modules/systemd-boot.nix - ../modules/grub.nix - ../modules/users.nix - ../modules/audio.nix - ../modules/bluetooth.nix - ../modules/tailscale.nix - ../modules/nix.nix - ../modules/network-manager.nix - ../modules/home-manager.nix - ../modules/power-profiles.nix - ../modules/utils.nix - ../modules/gvfs.nix - # ../modules/ovpn.nix + ../../nixos/audio.nix + ../../nixos/auto-upgrade.nix + ../../nixos/bluetooth.nix + ../../nixos/fonts.nix + ../../nixos/home-manager.nix + ../../nixos/network-manager.nix + ../../nixos/nix.nix + ../../nixos/nvidia.nix + ../../nixos/prime.nix + ../../nixos/systemd-boot.nix + ../../nixos/timezone.nix + ../../nixos/tuigreet.nix + ../../nixos/users.nix + ../../nixos/utils.nix + ../../nixos/xdg-portal.nix + ../../nixos/variables-config.nix + ../../themes/nixy.nix ./hardware-configuration.nix ./variables.nix ]; home-manager.users."${config.var.username}" = import ./home.nix; - stylix = { - enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - 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 = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - }; - serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - }; - targets.nixvim.transparentBackground = { - main = true; - signColumn = true; - }; - polarity = "dark"; - image = ../../home/wallpapers/nix.png; - }; - # Don't touch this system.stateVersion = "24.05"; } diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 7861e3a..f365320 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -18,8 +18,7 @@ # System (Desktop environment like stuff) ../../home/system/hyprland - # ../../home/system/gtk - ../../home/system/wlogout + ../../home/system/gtk ../../home/system/wofi ../../home/system/batsignal ../../home/system/zathura diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix index f07416d..4a483d9 100644 --- a/hosts/laptop/variables.nix +++ b/hosts/laptop/variables.nix @@ -1,5 +1,5 @@ { config, ... }: { - imports = [ ../modules/variables-config.nix ]; + imports = [ ../../nixos/variables-config.nix ]; config.var = { hostname = "nixy"; @@ -27,16 +27,23 @@ # change the sops configuration if you want to enable that: sops = true; - # Enable tailscale - tailscale = true; + # theme = import ../themes/nixy.nix; # select your theme here + theme = { + 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" - # USBGuard - # If usbguard enabled: set yours pref USB devices (change {id} to your trusted USB device), use `lsusb` command (from usbutils package) to get list - # of all connected USB devices including integrated devices like camera, bluetooth, wifi, etc. with their IDs or just disable `usbguard` - # allow id {id} # device 1... - usbguard = false; - usbguardRules = ""; - - theme = import ../themes/nixy.nix; # select your theme here + bar = { + transparent = false; + floating = false; + font-size = 16; + }; + }; }; } diff --git a/hosts/modules/grub.nix b/hosts/modules/grub.nix deleted file mode 100644 index 06d040f..0000000 --- a/hosts/modules/grub.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: { - boot = { - loader.grub.enable = true; - loader.grub.device = "nodev"; - loader.grub.useOSProber = true; - loader.grub.efiSupport = true; - loader.efi.canTouchEfiVariables = true; - tmp.cleanOnBoot = true; - kernelPackages = - pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc. - }; -} diff --git a/hosts/modules/gvfs.nix b/hosts/modules/gvfs.nix deleted file mode 100644 index f0e6989..0000000 --- a/hosts/modules/gvfs.nix +++ /dev/null @@ -1 +0,0 @@ -{ services.gvfs.enable = true; } diff --git a/hosts/modules/ovpn.nix b/hosts/modules/ovpn.nix deleted file mode 100644 index cb1e2d9..0000000 --- a/hosts/modules/ovpn.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - boot.initrd.network.openvpn.enable = false; - - services.openvpn = { - servers."ovpn" = { - config = "config /home/hadi/.ovpn.ovpn"; - autoStart = false; - }; - }; -} diff --git a/hosts/modules/power-profiles.nix b/hosts/modules/power-profiles.nix deleted file mode 100644 index 039eaf5..0000000 --- a/hosts/modules/power-profiles.nix +++ /dev/null @@ -1 +0,0 @@ -{ services.power-profiles-daemon.enable = true; } diff --git a/hosts/modules/tailscale.nix b/hosts/modules/tailscale.nix deleted file mode 100644 index 4c5d214..0000000 --- a/hosts/modules/tailscale.nix +++ /dev/null @@ -1 +0,0 @@ -{ config, ... }: { services.tailscale.enable = config.var.tailscale; } diff --git a/hosts/modules/usb.nix b/hosts/modules/usb.nix deleted file mode 100644 index 2d58b09..0000000 --- a/hosts/modules/usb.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, config, ... }: - -{ - # USB Automounting - # services.gvfs.enable = true; - services.udisks2.enable = true; - # services.devmon.enable = true; - - # Enable USB Guard - services.usbguard = { - enable = config.var.usbguard; - dbus.enable = true; - implicitPolicyTarget = "block"; - rules = config.var.usbguardRules; - }; - - # Enable USB-specific packages - environment.systemPackages = with pkgs; [ usbutils ]; -} diff --git a/hosts/modules/zsh.nix b/hosts/modules/zsh.nix deleted file mode 100644 index 3907b36..0000000 --- a/hosts/modules/zsh.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - programs.zsh = { - enable = true; - loginShellInit = '' - dbus-update-activation-environment --systemd DISPLAY - ''; - }; -} diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix deleted file mode 100644 index 170f9b8..0000000 --- a/hosts/server/configuration.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, ... }: { - imports = [ - ./hardware-configuration.nix - ./variables.nix - - ../modules/grub.nix - ../modules/timezone.nix - ../modules/utils.nix - ../modules/users.nix - ../modules/zsh.nix - ../modules/nix.nix - ../modules/auto-upgrade.nix - ../modules/home-manager.nix - ../modules/network-manager.nix - - # internal - ./modules/internal/security.nix - ./modules/internal/openssh.nix - # ./modules/internal/adguard.nix - # ./modules/internal/cockpit.nix - - # exposed - # ./modules/exposed/ntfy-sh.nix - ./modules/exposed/tailscale.nix - ./modules/exposed/kuma.nix - ./modules/exposed/cloudflare-dyndns.nix - ./modules/exposed/nginx.nix - ./modules/exposed/nextcloud.nix - ./modules/exposed/vaultwarden.nix - ./modules/www - - ./modules/jackflix - - ./secrets - ]; - - virtualisation.docker.enable = true; - - networking.networkmanager.enable = true; - - home-manager.users."${config.var.username}" = import ./home.nix; - - users.users.${config.var.username} = { - openssh.authorizedKeys.keys = [ config.var.sshPublicKey ]; - }; - - # Don't touch this - system.stateVersion = "24.05"; -} diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix deleted file mode 100644 index 537eefe..0000000 --- a/hosts/server/hardware-configuration.nix +++ /dev/null @@ -1,31 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/f60945a8-32c6-49ba-b541-d1716385527b"; - fsType = "ext4"; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..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; + }; + +}