diff --git a/flake.lock b/flake.lock index faa2ae7..69decfe 100644 --- a/flake.lock +++ b/flake.lock @@ -423,6 +423,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1718349360, + "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1717786204, @@ -530,6 +546,35 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1718310343, + "narHash": "sha256-jD2XqvofA5hdROv8OSTss/vjJi164Mjavgh2yJf2ej4=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ca312c14ad9abbb8736b9f9fd6fa8b8f60b2f1b2", + "type": "github" + }, + "original": { + "id": "nur", + "type": "indirect" + } + }, + "nurpkgs": { + "locked": { + "lastModified": 1718310343, + "narHash": "sha256-jD2XqvofA5hdROv8OSTss/vjJi164Mjavgh2yJf2ej4=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ca312c14ad9abbb8736b9f9fd6fa8b8f60b2f1b2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "ny": { "flake": false, "locked": { @@ -547,8 +592,11 @@ "apple-fonts": "apple-fonts", "home-manager": "home-manager", "hyprland": "hyprland", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", + "nur": "nur", + "nurpkgs": "nurpkgs", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix" } diff --git a/flake.nix b/flake.nix index 8389d5e..897a7e3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,6 @@ { - description = "Nixy - Hadi's NixOS configuration"; + description = + "My NixOs dotfiles - Home-manager, hyprland, nixvim, sops, kitty, wofi, waybar, lf, dunst, qutebrowser, tmux, ..."; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -18,18 +19,20 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + nurpkgs.url = "github:nix-community/NUR"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = - inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix, ... }: { + outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix + , nur, nixos-hardware, ... }: { nixosConfigurations = { nixy = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + { nixpkgs.overlays = [ nur.overlay ]; } ./hosts/laptop/configuration.nix - ./hosts/laptop/fonts.nix - ./hosts/laptop/tuigreet.nix + nixos-hardware.nixosModules.omen-16-n0005ne { _module.args = { inherit inputs; }; } home-manager.nixosModules.home-manager { @@ -47,27 +50,6 @@ } ]; }; - - heaven = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./hosts/server/configuration.nix - { _module.args = { inherit inputs; }; } - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users."hadi" = import ./home/server.nix; # CHANGE ME - extraSpecialArgs = { - inherit inputs; - inherit sops-nix; - }; - }; - } - ]; - }; - }; }; } diff --git a/home/apps/kitty/default.nix b/home/apps/kitty/default.nix deleted file mode 100644 index e757bd5..0000000 --- a/home/apps/kitty/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, pkgs, ... }: { - - programs.kitty = { - enable = true; - settings = { - - scrollback_lines = 10000; - enable_audio_bell = false; - update_check_interval = 0; - font_family = config.theme.font-mono; - font_size = 13; - cursor_shape = "Underline"; - cursor_underline_thickness = 1; - window_padding_width = 10; - url_style = "curly"; - confirm_os_window_close = "0"; - remember_window_size = "no"; - disable_ligatures = "never"; - shell = "${pkgs.tmux}/bin/tmux"; - initial_window_width = 1200; - initial_window_height = 600; - - background = "#" + config.theme.colors.bg; - url_color = "#" + config.theme.colors.primary-fg; - - color0 = "#" + config.theme.colors.color0; - color8 = "#" + config.theme.colors.color8; - color1 = "#" + config.theme.colors.color1; - color9 = "#" + config.theme.colors.color9; - color2 = "#" + config.theme.colors.color2; - color10 = "#" + config.theme.colors.color10; - color3 = "#" + config.theme.colors.color3; - color11 = "#" + config.theme.colors.color11; - color4 = "#" + config.theme.colors.color4; - color12 = "#" + config.theme.colors.color12; - color5 = "#" + config.theme.colors.color5; - color13 = "#" + config.theme.colors.color13; - color6 = "#" + config.theme.colors.color6; - color14 = "#" + config.theme.colors.color14; - color7 = "#" + config.theme.colors.color7; - color15 = "#" + config.theme.colors.color15; - - cursor = "#" + config.theme.colors.fg; - cursor_text_color = "#" + config.theme.colors.bg; - - selection_foreground = "#" + config.theme.colors.primary-fg; - selection_background = "#" + config.theme.colors.primary-bg; - }; - }; -} diff --git a/home/apps/laptop.nix b/home/apps/laptop.nix deleted file mode 100644 index a5bd904..0000000 --- a/home/apps/laptop.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - imports = [ - ./kitty - ./lf - ./neofetch - ./nvim/laptop.nix - ./qutebrowser - ./spicetify - ./wofi - ./cava - ./tmux - ./lazygit - ]; -} diff --git a/home/apps/qutebrowser/serverpage/default.nix b/home/apps/qutebrowser/serverpage/default.nix deleted file mode 100644 index 151ea3f..0000000 --- a/home/apps/qutebrowser/serverpage/default.nix +++ /dev/null @@ -1,298 +0,0 @@ -{ config, ... }: -let - bookmarks = '' - Apps: [ - {text: "TrueNAS", url: "https://heaven", icon: ""}, - {text: "Nextcloud", url: "https://cloud.anotherhadi.com/", icon: ""}, - {text: "Vaultwarden", url: "https://vault.anotherhadi.com/", icon: "󰟵"}, - {text: "Vaultwarden", url: "https://vault.anotherhadi.com/", icon: "󰟵"}, - {text: "Jellyfin", url: "https://media.anotherhadi.com", icon: "󰕧"}, - ], - Media: [ - {text: "Overseerr", url: "https://heaven:30023", icon: "O"}, - {text: "Radarr", url: "https://heaven:30025", icon: "R"}, - {text: "Sonarr", url: "https://heaven:30027", icon: "S"}, - {text: "Bazarr", url: "https://heaven:30046", icon: "B"}, - {text: "Prowlarr", url: "https://heaven:30050", icon: "P"}, - ], - Admin: [ - {text: "Vaultwarden", url: "https://vault.anotherhadi.com/admin", icon: "󰟵"}, - {text: "Cloudflare One", url: "https://one.dash.cloudflare.com/", icon: ""}, - {text: "Cloudflare", url: "https://cloudflare.com/", icon: ""}, - {text: "Tailscale", url: "https://login.tailscale.com/admin/machines", icon: "󰖂"}, - {text: "PiHole", url: "http://heaven:20720/admin", icon: "󰷱"}, - {text: "Unifi", url: "https://heaven:30072", icon: "󰌗"}, - ], - ''; -in { - - xdg.configFile."serverpage/index.html".text = '' - - - - - - - Homepage - - - - -
-
-

-

-
-
-

-
- -
- - - - - ''; -} diff --git a/home/apps/server.nix b/home/apps/server.nix deleted file mode 100644 index 568045a..0000000 --- a/home/apps/server.nix +++ /dev/null @@ -1 +0,0 @@ -{ imports = [ ./lf ./neofetch ]; } diff --git a/home/apps/spicetify/default.nix b/home/apps/spicetify/default.nix deleted file mode 100644 index 9c9c90d..0000000 --- a/home/apps/spicetify/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, config, lib, spicetify-nix, ... }: -let spicePkgs = spicetify-nix.packages.${pkgs.system}.default; -in { - - imports = [ spicetify-nix.homeManagerModules.default ]; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ "spotify" ]; - programs.spicetify = { - enable = true; - theme = spicePkgs.themes.text; - colorScheme = "custom"; - - customColorScheme = { - text = "${config.theme.colors.fg}"; - subtext = "${config.theme.colors.alt-fg}"; - sidebar-text = "${config.theme.colors.alt-fg}"; - main = "${config.theme.colors.bg}"; - sidebar = "${config.theme.colors.bg}"; - background = "${config.theme.colors.bg}"; - player = "${config.theme.colors.bg}"; - card = "${config.theme.colors.bg}"; - shadow = "000000"; - selected-row = "${config.theme.colors.alt-bg}"; - button = "${config.theme.colors.primary-bg}"; - button-active = "${config.theme.colors.primary-bg}"; - button-disabled = "${config.theme.colors.alt-bg}"; - tab-active = "${config.theme.colors.primary-bg}"; - misc = "${config.theme.colors.alt-fg}"; - }; - - enabledExtensions = with spicePkgs.extensions; [ - playlistIcons - lastfm - historyShortcut - hidePodcasts - fullAppDisplay - shuffle - ]; - }; -} diff --git a/home/laptop.nix b/home/laptop.nix index 55229f0..4c7176d 100644 --- a/home/laptop.nix +++ b/home/laptop.nix @@ -1,25 +1,21 @@ -{ pkgs, ... }: -let variable = import ../variables.nix; -in { +{ pkgs, config, ... }: { imports = [ + ../hosts/laptop/variables.nix ./system/laptop.nix ./scripts/laptop.nix - ./apps/laptop.nix - ./themes/nixy.nix - ./themes/config/load_wallpapers.nix + ./programs/laptop.nix ]; home = { - username = variable.username; - homeDirectory = variable.homeDirectory; + inherit (config.var) username; + inherit (config.var) homeDirectory; packages = with pkgs; [ swappy imv discord - # obsidian # BROKEN - btop + obsidian xfce.thunar bitwarden vlc @@ -32,8 +28,6 @@ in { jq # Utils - sops # Secrets - age # Secrets fd bc gcc @@ -43,9 +37,9 @@ in { xdg_utils wget curl - neovide wf-recorder glow + nwg-displays # Just cool peaclock @@ -55,11 +49,19 @@ in { # Backup vscode - firefox tor-browser + firefox + neovide ]; - stateVersion = variable.stateVersion; + file."wallpapers" = { + recursive = true; + source = ./wallpapers; + }; + + stateVersion = "24.05"; }; + programs.home-manager.enable = true; + } diff --git a/home/programs/btop/default.nix b/home/programs/btop/default.nix new file mode 100644 index 0000000..c1a556f --- /dev/null +++ b/home/programs/btop/default.nix @@ -0,0 +1,9 @@ +{ + programs.btop = { + enable = true; + settings = { + color_theme = "Default"; + theme_background = false; + }; + }; +} diff --git a/home/apps/cava/default.nix b/home/programs/cava/default.nix similarity index 60% rename from home/apps/cava/default.nix rename to home/programs/cava/default.nix index 4244173..5bb2c89 100644 --- a/home/apps/cava/default.nix +++ b/home/programs/cava/default.nix @@ -5,8 +5,8 @@ general.framerate = 60; smoothing.noise_reduction = 88; color = { - background = "'#${config.theme.colors.bg}'"; - foreground = "'#${config.theme.colors.primary-bg}'"; + background = "'#${config.var.theme.colors.bg}'"; + foreground = "'#${config.var.theme.colors.accent}'"; }; }; }; diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix new file mode 100644 index 0000000..7480ac3 --- /dev/null +++ b/home/programs/kitty/default.nix @@ -0,0 +1,48 @@ +{ config, pkgs, ... }: { + programs.kitty = { + enable = true; + settings = { + scrollback_lines = 10000; + initial_window_width = 1200; + initial_window_height = 600; + update_check_interval = 0; + enable_audio_bell = false; + confirm_os_window_close = "0"; + remember_window_size = "no"; + disable_ligatures = "never"; + shell = "${pkgs.tmux}/bin/tmux"; + url_style = "curly"; + cursor_shape = "Underline"; + cursor_underline_thickness = 1; + window_padding_width = config.var.theme.gaps-out; + + # Font + font_family = config.var.theme.font-mono; + font_size = 13; + + # Colors + background = "#" + config.var.theme.colors.bg; + url_color = "#" + config.var.theme.colors.accent; + color0 = "#" + config.var.theme.colors.c0; + color8 = "#" + config.var.theme.colors.c8; + color1 = "#" + config.var.theme.colors.c1; + color9 = "#" + config.var.theme.colors.c9; + color2 = "#" + config.var.theme.colors.c2; + color10 = "#" + config.var.theme.colors.c10; + color3 = "#" + config.var.theme.colors.c3; + color11 = "#" + config.var.theme.colors.c11; + color4 = "#" + config.var.theme.colors.c4; + color12 = "#" + config.var.theme.colors.c12; + color5 = "#" + config.var.theme.colors.c5; + color13 = "#" + config.var.theme.colors.c13; + color6 = "#" + config.var.theme.colors.c6; + color14 = "#" + config.var.theme.colors.c14; + color7 = "#" + config.var.theme.colors.c7; + color15 = "#" + config.var.theme.colors.c15; + cursor = "#" + config.var.theme.colors.fg; + cursor_text_color = "#" + config.var.theme.colors.bg; + selection_foreground = "#" + config.var.theme.colors.accentFg; + selection_background = "#" + config.var.theme.colors.accent; + }; + }; +} diff --git a/home/programs/laptop.nix b/home/programs/laptop.nix new file mode 100644 index 0000000..2ab4c52 --- /dev/null +++ b/home/programs/laptop.nix @@ -0,0 +1,4 @@ +{ + imports = + [ ./btop ./kitty ./nvim/laptop.nix ./qutebrowser ./spicetify ./cava ]; +} diff --git a/home/apps/nvim/alpha.nix b/home/programs/nvim/alpha.nix similarity index 96% rename from home/apps/nvim/alpha.nix rename to home/programs/nvim/alpha.nix index 47db524..a698867 100644 --- a/home/apps/nvim/alpha.nix +++ b/home/programs/nvim/alpha.nix @@ -1,9 +1,9 @@ { config, ... }: { programs.nixvim.highlight = { - AlphaHeaderColor.fg = "#${config.theme.colors.primary-bg}"; - AlphaTextColor.fg = "#${config.theme.colors.fg}"; - AlphaShortcutColor.fg = "#${config.theme.colors.alt-fg}"; + AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}"; + AlphaTextColor.fg = "#${config.var.theme.colors.fg}"; + AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}"; }; programs.nixvim.plugins.alpha = { diff --git a/home/apps/nvim/auto-pairs.nix b/home/programs/nvim/auto-pairs.nix similarity index 100% rename from home/apps/nvim/auto-pairs.nix rename to home/programs/nvim/auto-pairs.nix diff --git a/home/apps/nvim/bufferline.nix b/home/programs/nvim/bufferline.nix similarity index 100% rename from home/apps/nvim/bufferline.nix rename to home/programs/nvim/bufferline.nix diff --git a/home/apps/nvim/cmp.nix b/home/programs/nvim/cmp.nix similarity index 100% rename from home/apps/nvim/cmp.nix rename to home/programs/nvim/cmp.nix diff --git a/home/apps/nvim/comment.nix b/home/programs/nvim/comment.nix similarity index 100% rename from home/apps/nvim/comment.nix rename to home/programs/nvim/comment.nix diff --git a/home/apps/nvim/copilot.nix b/home/programs/nvim/copilot.nix similarity index 100% rename from home/apps/nvim/copilot.nix rename to home/programs/nvim/copilot.nix diff --git a/home/apps/nvim/git.nix b/home/programs/nvim/git.nix similarity index 100% rename from home/apps/nvim/git.nix rename to home/programs/nvim/git.nix diff --git a/home/apps/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix similarity index 100% rename from home/apps/nvim/keymaps.nix rename to home/programs/nvim/keymaps.nix diff --git a/home/apps/nvim/laptop.nix b/home/programs/nvim/laptop.nix similarity index 100% rename from home/apps/nvim/laptop.nix rename to home/programs/nvim/laptop.nix diff --git a/home/apps/nvim/lazygit.nix b/home/programs/nvim/lazygit.nix similarity index 100% rename from home/apps/nvim/lazygit.nix rename to home/programs/nvim/lazygit.nix diff --git a/home/apps/nvim/lightline.nix b/home/programs/nvim/lightline.nix similarity index 100% rename from home/apps/nvim/lightline.nix rename to home/programs/nvim/lightline.nix diff --git a/home/apps/nvim/lsp.nix b/home/programs/nvim/lsp.nix similarity index 100% rename from home/apps/nvim/lsp.nix rename to home/programs/nvim/lsp.nix diff --git a/home/apps/nvim/noice.nix b/home/programs/nvim/noice.nix similarity index 100% rename from home/apps/nvim/noice.nix rename to home/programs/nvim/noice.nix diff --git a/home/apps/nvim/none-ls.nix b/home/programs/nvim/none-ls.nix similarity index 100% rename from home/apps/nvim/none-ls.nix rename to home/programs/nvim/none-ls.nix diff --git a/home/apps/nvim/nvim-tree.nix b/home/programs/nvim/nvim-tree.nix similarity index 100% rename from home/apps/nvim/nvim-tree.nix rename to home/programs/nvim/nvim-tree.nix diff --git a/home/apps/nvim/obsidian.nix b/home/programs/nvim/obsidian.nix similarity index 77% rename from home/apps/nvim/obsidian.nix rename to home/programs/nvim/obsidian.nix index aa44d5b..458edce 100644 --- a/home/apps/nvim/obsidian.nix +++ b/home/programs/nvim/obsidian.nix @@ -2,7 +2,7 @@ programs.nixvim.plugins.obsidian = { enable = true; settings = { - dir = "~/Nextcloud/obsidian"; + dir = "~/nextcloud/Notes"; disable_frontmatter = true; }; }; diff --git a/home/apps/nvim/oil.nix b/home/programs/nvim/oil.nix similarity index 100% rename from home/apps/nvim/oil.nix rename to home/programs/nvim/oil.nix diff --git a/home/apps/nvim/options.nix b/home/programs/nvim/options.nix similarity index 100% rename from home/apps/nvim/options.nix rename to home/programs/nvim/options.nix diff --git a/home/apps/nvim/telescope.nix b/home/programs/nvim/telescope.nix similarity index 100% rename from home/apps/nvim/telescope.nix rename to home/programs/nvim/telescope.nix diff --git a/home/apps/nvim/tmux-navigator.nix b/home/programs/nvim/tmux-navigator.nix similarity index 100% rename from home/apps/nvim/tmux-navigator.nix rename to home/programs/nvim/tmux-navigator.nix diff --git a/home/apps/nvim/toggleterm.nix b/home/programs/nvim/toggleterm.nix similarity index 100% rename from home/apps/nvim/toggleterm.nix rename to home/programs/nvim/toggleterm.nix diff --git a/home/apps/nvim/treesitter.nix b/home/programs/nvim/treesitter.nix similarity index 100% rename from home/apps/nvim/treesitter.nix rename to home/programs/nvim/treesitter.nix diff --git a/home/apps/nvim/trouble.nix b/home/programs/nvim/trouble.nix similarity index 100% rename from home/apps/nvim/trouble.nix rename to home/programs/nvim/trouble.nix diff --git a/home/apps/nvim/whichkey.nix b/home/programs/nvim/whichkey.nix similarity index 100% rename from home/apps/nvim/whichkey.nix rename to home/programs/nvim/whichkey.nix diff --git a/home/apps/nvim/wilder.nix b/home/programs/nvim/wilder.nix similarity index 100% rename from home/apps/nvim/wilder.nix rename to home/programs/nvim/wilder.nix diff --git a/home/apps/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix similarity index 64% rename from home/apps/qutebrowser/default.nix rename to home/programs/qutebrowser/default.nix index db679f1..662084c 100644 --- a/home/apps/qutebrowser/default.nix +++ b/home/programs/qutebrowser/default.nix @@ -1,6 +1,6 @@ { config, ... }: { - imports = [ ./duckduckgo-colorscheme.nix ./homepage ./serverpage ]; + imports = [ ./duckduckgo-colorscheme.nix ./homepage ]; programs.qutebrowser = { enable = true; @@ -18,8 +18,8 @@ }; quickmarks = { - home = "${config.home.homeDirectory}/.config/startpage/index.html"; - server = "${config.home.homeDirectory}/.config/serverpage/index.html"; + home = "${config.var.homeDirectory}/.config/startpage/index.html"; + server = "${config.var.homeDirectory}/.config/serverpage/index.html"; mynixos = "https://mynixos.com"; github = "https://github.com"; outlook = "https://outlook.office.com/mail/"; @@ -39,92 +39,92 @@ settings = { url = { default_page = - "${config.home.homeDirectory}/.config/startpage/index.html"; + "${config.var.homeDirectory}/.config/startpage/index.html"; start_pages = - [ "${config.home.homeDirectory}/.config/startpage/index.html" ]; + [ "${config.var.homeDirectory}/.config/startpage/index.html" ]; }; colors = { tabs = { - odd.bg = "#${config.theme.colors.bg}"; - odd.fg = "#${config.theme.colors.fg}"; - even.bg = "#${config.theme.colors.bg}"; - even.fg = "#${config.theme.colors.fg}"; + odd.bg = "#${config.var.theme.colors.bg}"; + odd.fg = "#${config.var.theme.colors.fg}"; + even.bg = "#${config.var.theme.colors.bg}"; + even.fg = "#${config.var.theme.colors.fg}"; selected = { odd = { - bg = "#${config.theme.colors.primary-bg}"; - fg = "#${config.theme.colors.primary-fg}"; + bg = "#${config.var.theme.colors.accent}"; + fg = "#${config.var.theme.colors.accentFg}"; }; even = { - bg = "#${config.theme.colors.primary-bg}"; - fg = "#${config.theme.colors.primary-fg}"; + bg = "#${config.var.theme.colors.accent}"; + fg = "#${config.var.theme.colors.accentFg}"; }; }; indicator = { - error = "#${config.theme.colors.color1}"; - start = "#${config.theme.colors.alt-bg}"; - stop = "#${config.theme.colors.alt-bg}"; + error = "#${config.var.theme.colors.c1}"; + start = "#${config.var.theme.colors.bgalt}"; + stop = "#${config.var.theme.colors.bgalt}"; }; }; hints = { - bg = "#${config.theme.colors.alt-bg}"; - fg = "#${config.theme.colors.alt-fg}"; - match.fg = "#${config.theme.colors.bg}"; + bg = "#${config.var.theme.colors.bgalt}"; + fg = "#${config.var.theme.colors.fgalt}"; + match.fg = "#${config.var.theme.colors.bg}"; }; completion = { category = { - bg = "#${config.theme.colors.bg}"; - fg = "#${config.theme.colors.fg}"; + bg = "#${config.var.theme.colors.bg}"; + fg = "#${config.var.theme.colors.fg}"; border = { - top = "#${config.theme.colors.bg}"; - bottom = "#${config.theme.colors.bg}"; + top = "#${config.var.theme.colors.bg}"; + bottom = "#${config.var.theme.colors.bg}"; }; }; - odd.bg = "#${config.theme.colors.bg}"; - even.bg = "#${config.theme.colors.bg}"; + odd.bg = "#${config.var.theme.colors.bg}"; + even.bg = "#${config.var.theme.colors.bg}"; fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ]; - match.fg = "#${config.theme.colors.primary-bg}"; + match.fg = "#${config.var.theme.colors.accent}"; item.selected = { - bg = "#${config.theme.colors.primary-bg}"; - border.top = "#${config.theme.colors.primary-bg}"; - border.bottom = "#${config.theme.colors.primary-bg}"; - fg = "#${config.theme.colors.primary-fg}"; - match.fg = "#${config.theme.colors.primary-fg}"; + bg = "#${config.var.theme.colors.accent}"; + border.top = "#${config.var.theme.colors.accent}"; + border.bottom = "#${config.var.theme.colors.accent}"; + fg = "#${config.var.theme.colors.accentFg}"; + match.fg = "#${config.var.theme.colors.accentFg}"; }; }; statusbar = { - normal.bg = "#${config.theme.colors.bg}"; - normal.fg = "#${config.theme.colors.fg}"; - private.bg = "#${config.theme.colors.bg}"; - private.fg = "#${config.theme.colors.fg}"; - insert.bg = "#${config.theme.colors.primary-bg}"; - insert.fg = "#${config.theme.colors.primary-fg}"; + normal.bg = "#${config.var.theme.colors.bg}"; + normal.fg = "#${config.var.theme.colors.fg}"; + private.bg = "#${config.var.theme.colors.bg}"; + private.fg = "#${config.var.theme.colors.fg}"; + insert.bg = "#${config.var.theme.colors.accent}"; + insert.fg = "#${config.var.theme.colors.accentFg}"; command = { - bg = "#${config.theme.colors.alt-bg}"; - fg = "#${config.theme.colors.alt-fg}"; - private.bg = "#${config.theme.colors.alt-bg}"; - private.fg = "#${config.theme.colors.alt-fg}"; + bg = "#${config.var.theme.colors.bgalt}"; + fg = "#${config.var.theme.colors.fgalt}"; + private.bg = "#${config.var.theme.colors.bgalt}"; + private.fg = "#${config.var.theme.colors.fgalt}"; }; }; messages = { info = { - bg = "#${config.theme.colors.alt-bg}"; - fg = "#${config.theme.colors.alt-fg}"; - border = "#${config.theme.colors.alt-bg}"; + bg = "#${config.var.theme.colors.bgalt}"; + fg = "#${config.var.theme.colors.fgalt}"; + border = "#${config.var.theme.colors.bgalt}"; }; error = { - bg = "#${config.theme.colors.color1}"; - fg = "#${config.theme.colors.alt-fg}"; - border = "#${config.theme.colors.color1}"; + bg = "#${config.var.theme.colors.c1}"; + fg = "#${config.var.theme.colors.fgalt}"; + border = "#${config.var.theme.colors.c1}"; }; }; @@ -133,7 +133,7 @@ "dark"; # Enable dark mode for websites that support it }; - fonts = { default_family = "${config.theme.font}"; }; + fonts = { default_family = "${config.var.theme.font}"; }; completion = { height = "30%"; @@ -184,9 +184,8 @@ keyBindings = { normal = { - "gh" = "open ${config.home.homeDirectory}/.config/startpage/index.html"; - "gs" = - "open ${config.home.homeDirectory}/.config/serverpage/index.html"; + "gh" = "open ${config.var.homeDirectory}/.config/startpage/index.html"; + "gs" = "open ${config.var.homeDirectory}/.config/serverpage/index.html"; " p" = "tab-move -"; " n" = "tab-move +"; diff --git a/home/apps/qutebrowser/duckduckgo-colorscheme.nix b/home/programs/qutebrowser/duckduckgo-colorscheme.nix similarity index 79% rename from home/apps/qutebrowser/duckduckgo-colorscheme.nix rename to home/programs/qutebrowser/duckduckgo-colorscheme.nix index 93ffd7f..e3ea834 100644 --- a/home/apps/qutebrowser/duckduckgo-colorscheme.nix +++ b/home/programs/qutebrowser/duckduckgo-colorscheme.nix @@ -4,7 +4,7 @@ // Go to DuckDuckGo settings page, open the console, paste the code and hit enter. // based on https://ddg.codingcodax.dev/ // Cookies string for your theme - const cookie = '7=${config.theme.colors.bg}; j=${config.theme.colors.bg}; 9=${config.theme.colors.fg}; aa=${config.theme.colors.alt-fg}; 8=${config.theme.colors.color7}; x=${config.theme.colors.primary-bg}; 21=${config.theme.colors.alt-bg};'; + const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};'; // Converts cookie string into formatted JSON const cookieToJSON = (cookieRaw) => { diff --git a/home/apps/qutebrowser/homepage/default.nix b/home/programs/qutebrowser/homepage/default.nix similarity index 96% rename from home/apps/qutebrowser/homepage/default.nix rename to home/programs/qutebrowser/homepage/default.nix index cc60626..ad35042 100644 --- a/home/apps/qutebrowser/homepage/default.nix +++ b/home/programs/qutebrowser/homepage/default.nix @@ -40,7 +40,7 @@ in { p { margin: 0; padding: 0; - font-family: '${config.theme.font}', sans-serif; + font-family: '${config.var.theme.font}', sans-serif; } .w-screen { @@ -175,14 +175,14 @@ in { - +

-

+

@@ -232,7 +232,7 @@ in { const url = document.createElement('p'); url.textContent = link.url; url.className = 'text-sm'; - url.style = "color: #${config.theme.colors.alt-fg};" + url.style = "color: #${config.var.theme.colors.fgalt};" divNameUrl.appendChild(name); divNameUrl.appendChild(url); diff --git a/home/programs/spicetify/default.nix b/home/programs/spicetify/default.nix new file mode 100644 index 0000000..32294cf --- /dev/null +++ b/home/programs/spicetify/default.nix @@ -0,0 +1,40 @@ +{ pkgs, config, lib, spicetify-nix, ... }: +let spicePkgs = spicetify-nix.packages.${pkgs.system}.default; +in { + + imports = [ spicetify-nix.homeManagerModules.default ]; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ "spotify" ]; + programs.spicetify = { + enable = true; + theme = spicePkgs.themes.text; + colorScheme = "custom"; + + customColorScheme = { + text = "${config.var.theme.colors.fg}"; + subtext = "${config.var.theme.colors.fgalt}"; + sidebar-text = "${config.var.theme.colors.fgalt}"; + main = "${config.var.theme.colors.bg}"; + sidebar = "${config.var.theme.colors.bg}"; + background = "${config.var.theme.colors.bg}"; + player = "${config.var.theme.colors.bg}"; + card = "${config.var.theme.colors.bg}"; + shadow = "000000"; + selected-row = "${config.var.theme.colors.bgalt}"; + button = "${config.var.theme.colors.accent}"; + button-active = "${config.var.theme.colors.accent}"; + button-disabled = "${config.var.theme.colors.bgalt}"; + tab-active = "${config.var.theme.colors.accent}"; + misc = "${config.var.theme.colors.fgalt}"; + }; + + enabledExtensions = with spicePkgs.extensions; [ + playlistIcons + lastfm + historyShortcut + hidePodcasts + fullAppDisplay + shuffle + ]; + }; +} diff --git a/home/scripts/brightness/default.nix b/home/scripts/brightness/default.nix index 67677bd..dd05842 100644 --- a/home/scripts/brightness/default.nix +++ b/home/scripts/brightness/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: let increments = "5"; diff --git a/home/scripts/heaven/default.nix b/home/scripts/heaven/default.nix deleted file mode 100644 index f79998d..0000000 --- a/home/scripts/heaven/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, config, ... }: - -let - homedir = config.home.homeDirectory; - - heaven-rebuild = pkgs.writeShellScriptBin "heaven-rebuild" '' - sudo nixos-rebuild switch --flake ${homedir}/.config/nixos#heaven - ''; - - heaven-upgrade = pkgs.writeShellScriptBin "heaven-upgrade" '' - sudo nixos-rebuild switch --upgrade --flake ${homedir}/.config/nixos#heaven - ''; - - heaven-update = pkgs.writeShellScriptBin "heaven-update" '' - cd ${homedir}/.config/nixos && sudo nix flake update - ''; - - heaven-gc = pkgs.writeShellScriptBin "heaven-gc" '' - cd ${homedir}/.config/nixos && sudo nix-collect-garbage -d - ''; - - heaven-cb = pkgs.writeShellScriptBin "heaven-cb" '' - sudo /run/current-system/bin/switch-to-configuration boot - ''; - - remote-rebuild = pkgs.writeShellScriptBin "remote-rebuild" '' - ssh -t heaven "cd ~/.config/nixos && git pull && heaven-rebuild" - ''; - -in { - home.packages = with pkgs; [ - heaven-rebuild - heaven-upgrade - heaven-update - heaven-gc - heaven-cb - remote-rebuild - ]; -} diff --git a/home/scripts/laptop.nix b/home/scripts/laptop.nix index 1a31ff5..ba52667 100644 --- a/home/scripts/laptop.nix +++ b/home/scripts/laptop.nix @@ -1,7 +1,6 @@ { imports = [ ./nixy - ./nerdfetch ./sounds ./brightness ./caffeine diff --git a/home/scripts/nixy/default.nix b/home/scripts/nixy/default.nix index 679be48..b152d55 100644 --- a/home/scripts/nixy/default.nix +++ b/home/scripts/nixy/default.nix @@ -23,14 +23,6 @@ let sudo /run/current-system/bin/switch-to-configuration boot ''; - heaven-push = pkgs.writeShellScriptBin "heaven-push" '' - cd ~/dev/heaven && git add . && git commit -m ''${1:-Update} && git push - ''; - - remote-rebuild = pkgs.writeShellScriptBin "remote-rebuild" '' - ssh -t heaven "cd ~/.config/nixos && git pull && heaven-rebuild" - ''; - in { home.packages = with pkgs; [ nixy-rebuild @@ -38,8 +30,5 @@ in { nixy-update nixy-gc nixy-cb - - heaven-push - remote-rebuild ]; } diff --git a/home/scripts/server.nix b/home/scripts/server.nix deleted file mode 100644 index 0b3e233..0000000 --- a/home/scripts/server.nix +++ /dev/null @@ -1 +0,0 @@ -{ imports = [ ./heaven ./nixy ./nerdfetch ./compress ]; } diff --git a/home/scripts/startup/default.nix b/home/scripts/startup/default.nix index 9580e12..525946b 100644 --- a/home/scripts/startup/default.nix +++ b/home/scripts/startup/default.nix @@ -1,8 +1,6 @@ # File runned at startup by Hyprland -{ pkgs, ... }: +{ pkgs, config, ... }: let - variable = import ../../../variables.nix; - nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" '' # Start nextcloud if I'm on my local network while true;do @@ -31,11 +29,9 @@ let startup = pkgs.writeShellScriptBin "startup" '' # Because HM enabling services suck. - [[ ${ - toString variable.enableSops - } == "1" ]] && systemctl --user start sops-nix + [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix - [[ ${toString variable.enableNextcloud} == "1" ]] && nextcloud-watch & + [[ ${toString config.var.nextcloud} == "1" ]] && nextcloud-watch & notify-system & ${pkgs.waybar}/bin/waybar & diff --git a/home/server.nix b/home/server.nix deleted file mode 100644 index 6114316..0000000 --- a/home/server.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: -let variable = import ../variables.nix; -in { - - imports = [ - ./system/server.nix - ./scripts/server.nix - ./apps/server.nix - ./themes/wip.nix - ]; - - home = { - username = variable.username; - homeDirectory = variable.homeDirectory; - - packages = with pkgs; [ - btop - - # Dev - go - cargo - nodejs - python3 - jq - - # Utils - sops # Secrets - age # Secrets - fd - bc - gcc - zip - unzip - wget - curl - ]; - - stateVersion = variable.server.stateVersion; - }; - programs.home-manager.enable = true; -} diff --git a/home/system/dunst/default.nix b/home/system/dunst/default.nix index 9f45a84..ddb6d1c 100644 --- a/home/system/dunst/default.nix +++ b/home/system/dunst/default.nix @@ -34,17 +34,17 @@ sticky_history = "yes"; history_length = 20; always_run_script = true; - corner_radius = config.theme.rounding; + corner_radius = config.var.theme.rounding; follow = "mouse"; - font = config.theme.font; + font = config.var.theme.font; format = "%s\\n%b"; - progress_bar_corner_radius = config.theme.rounding - 10; + progress_bar_corner_radius = config.var.theme.rounding - 10; #format = '' - # %s %p + # %s %p # %b''; - frame_color = "#" + config.theme.colors.bg; - highlight = "#" + config.theme.colors.primary-bg; - foreground = "#" + config.theme.colors.fg; + frame_color = "#" + config.var.theme.colors.bg; + highlight = "#" + config.var.theme.colors.accent; + foreground = "#" + config.var.theme.colors.fg; frame_width = 1; offset = "0x10"; horizontal_padding = 10; @@ -67,16 +67,16 @@ fullscreen_delay_everything = { fullscreen = "delay"; }; urgency_critical = { - background = "#" + config.theme.colors.color1; - foreground = "#" + config.theme.colors.color0; + background = "#" + config.var.theme.colors.c1; + foreground = "#" + config.var.theme.colors.c0; }; urgency_low = { - background = "#" + config.theme.colors.alt-bg; - foreground = "#" + config.theme.colors.alt-fg; + background = "#" + config.var.theme.colors.bgalt; + foreground = "#" + config.var.theme.colors.fgalt; }; urgency_normal = { - background = "#" + config.theme.colors.alt-bg; - foreground = "#" + config.theme.colors.alt-fg; + background = "#" + config.var.theme.colors.bgalt; + foreground = "#" + config.var.theme.colors.fgalt; }; }; }; diff --git a/home/system/git/default.nix b/home/system/git/default.nix index e370977..4e37cc2 100644 --- a/home/system/git/default.nix +++ b/home/system/git/default.nix @@ -1,9 +1,8 @@ -let variable = import ../../../variables.nix; -in { +{ config, ... }: { programs.git = { enable = true; - userName = variable.git.username; - userEmail = variable.git.email; + userName = config.var.git.username; + userEmail = config.var.git.email; ignores = [ ".cache/" ".DS_Store" diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 6b3d420..8a00d7d 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -1,6 +1,4 @@ -{ pkgs, config, hyprland, ... }: -let variable = import ../../../variables.nix; -in { +{ pkgs, config, hyprland, ... }: { imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ]; @@ -41,8 +39,15 @@ in { "${pkgs.bitwarden}/bin/bitwarden" ]; - monitor = - [ "eDP-2,highres,0x0,1" "DP-8,highrr,2560x0,1" ",prefered,auto,1" ]; + monitor = [ + "eDP-2,highres,0x0,1" + # "DP-9,highrr,2560x0,1" + # ",prefered,auto,1" + #"desc:,2560x1440@240.0,0x0,1.0" + #"desc:,2560x1440@60.0,645x4362,1.0" + "desc:AOC U34G2G1 0x00000E06,3440x1440@59.97,2560x0,1.0" + ",disable" + ]; bind = [ "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" @@ -101,6 +106,7 @@ in { "XDG_SESSION_TYPE,wayland" "XDG_CURRENT_DESKTOP,Hyprland" "XDG_SESSION_TYPE,wayland" + "GBM_BACKEND,nvidia-drm" "XDG_SESSION_DESKTOP,Hyprland" "QT_AUTO_SCREEN_SCALE_FACTOR,1" "QT_QPA_PLATFORM=wayland,xcb" @@ -113,17 +119,17 @@ in { general = { resize_on_border = true; - gaps_in = config.theme.gaps-in; - gaps_out = config.theme.gaps-out; - border_size = config.theme.border-size; - "col.active_border" = "rgba(${config.theme.colors.primary-bg}ff)"; + gaps_in = config.var.theme.gaps-in; + gaps_out = config.var.theme.gaps-out; + border_size = config.var.theme.border-size; + "col.active_border" = "rgba(${config.var.theme.colors.accent}ff)"; "col.inactive_border" = "rgba(00000055)"; border_part_of_window = true; layout = "master"; }; decoration = { - rounding = config.theme.rounding; + rounding = config.var.theme.rounding; drop_shadow = true; shadow_range = 20; shadow_render_power = 3; @@ -143,7 +149,7 @@ in { }; input = { - kb_layout = variable.keyboardLayout; + kb_layout = config.var.keyboardLayout; kb_options = "caps:escape"; follow_mouse = 1; @@ -251,7 +257,7 @@ in { }; font = { - name = config.theme.font; + name = config.var.theme.font; size = 11; }; }; diff --git a/home/system/hyprland/hyprlock.nix b/home/system/hyprland/hyprlock.nix index a1f4378..a7c8b38 100644 --- a/home/system/hyprland/hyprlock.nix +++ b/home/system/hyprland/hyprlock.nix @@ -5,8 +5,8 @@ xdg.configFile."hypr/hyprlock.conf".text = '' background { monitor = - path = $HOME/.config/wallpapers/${config.theme.wallpaper} - color = rgb(${config.theme.colors.bg}) + path = $HOME/.config/wallpapers/${config.var.theme.wallpaper} + color = rgb(${config.var.theme.colors.bg}) blur_size = 4 blur_passes = 3 @@ -24,9 +24,9 @@ dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true - outer_color = rgb(${config.theme.colors.primary-bg}) - inner_color = rgb(${config.theme.colors.bg}) - font_color = rgb(${config.theme.colors.fg}) + outer_color = rgb(${config.var.theme.colors.accent}) + inner_color = rgb(${config.var.theme.colors.bg}) + font_color = rgb(${config.var.theme.colors.fg}) fade_on_empty = true placeholder_text = Password... # Text rendered in the input box when it's empty. hide_input = false @@ -39,9 +39,9 @@ label { monitor = text = cmd[update:1000] echo " $(date +"%H:%M:%S") " - color = rgb(${config.theme.colors.fg}) + color = rgb(${config.var.theme.colors.fg}) font_size = 64 - font_family = ${config.theme.font} + font_family = ${config.var.theme.font} position = 0, 16 halign = center valign = center @@ -51,9 +51,9 @@ label { monitor = text = Hey $USER - color = rgb(${config.theme.colors.fg}) + color = rgb(${config.var.theme.colors.fg}) font_size = 20 - font_family = ${config.theme.font} + font_family = ${config.var.theme.font} position = 0, 0 halign = center valign = center @@ -64,9 +64,9 @@ label { monitor = text = Type to unlock! - color = rgb(${config.theme.colors.fg}) + color = rgb(${config.var.theme.colors.fg}) font_size = 16 - font_family = ${config.theme.font} + font_family = ${config.var.theme.font} position = 0, 30 halign = center valign = bottom diff --git a/home/system/hyprland/hyprpaper.nix b/home/system/hyprland/hyprpaper.nix index d25c538..8a0bdf1 100644 --- a/home/system/hyprland/hyprpaper.nix +++ b/home/system/hyprland/hyprpaper.nix @@ -2,8 +2,8 @@ home.packages = with pkgs; [ hyprpaper ]; xdg.configFile."hypr/hyprpaper.conf".text = '' - preload = ~/.config/wallpapers/${config.theme.wallpaper} - wallpaper = ,~/.config/wallpapers/${config.theme.wallpaper} + preload = ~/wallpapers/${config.var.theme.wallpaper} + wallpaper = ,~/wallpapers/${config.var.theme.wallpaper} ipc=true splash=false ''; diff --git a/home/system/laptop.nix b/home/system/laptop.nix index 3bfc86b..37a32c1 100644 --- a/home/system/laptop.nix +++ b/home/system/laptop.nix @@ -1,4 +1,12 @@ { - imports = - [ ./git ./dunst ./hyprland ./shell ./sops/laptop.nix ./waybar ./wlogout ]; + imports = [ + ./git + ./dunst + ./hyprland + ./shell + ./sops/laptop.nix + ./waybar + ./wlogout + ./wofi + ]; } diff --git a/home/system/server.nix b/home/system/server.nix deleted file mode 100644 index 613d51b..0000000 --- a/home/system/server.nix +++ /dev/null @@ -1 +0,0 @@ -{ imports = [ ./git ./shell ./sops/server.nix ]; } diff --git a/home/system/shell/default.nix b/home/system/shell/default.nix index d5de2bd..e84d1d8 100644 --- a/home/system/shell/default.nix +++ b/home/system/shell/default.nix @@ -4,5 +4,9 @@ ./zsh.nix ./starship.nix ./zoxide.nix + ./tmux.nix + ./lazygit.nix + ./fetch + ./lf ]; } diff --git a/home/system/shell/fetch/default.nix b/home/system/shell/fetch/default.nix new file mode 100644 index 0000000..0cce11f --- /dev/null +++ b/home/system/shell/fetch/default.nix @@ -0,0 +1 @@ +{ imports = [ ./neofetch ./nerdfetch ]; } diff --git a/home/apps/neofetch/default.nix b/home/system/shell/fetch/neofetch/default.nix similarity index 96% rename from home/apps/neofetch/default.nix rename to home/system/shell/fetch/neofetch/default.nix index e3be732..62885bb 100644 --- a/home/apps/neofetch/default.nix +++ b/home/system/shell/fetch/neofetch/default.nix @@ -109,9 +109,9 @@ song_format="%artist% - %album% - %title%" song_shorthand="off" mpc_args=() - colors=(${toString config.theme.colors.primary-ansi-16-number} 1 ${ - toString config.theme.colors.primary-ansi-16-number - } ${toString config.theme.colors.primary-ansi-16-number} 7) + 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/scripts/nerdfetch/default.nix b/home/system/shell/fetch/nerdfetch/default.nix similarity index 97% rename from home/scripts/nerdfetch/default.nix rename to home/system/shell/fetch/nerdfetch/default.nix index 3e0d3cf..8808a22 100644 --- a/home/scripts/nerdfetch/default.nix +++ b/home/system/shell/fetch/nerdfetch/default.nix @@ -1,4 +1,3 @@ -# Nerdfetch: https://github.com/ThatOneCalculator/NerdFetch { pkgs, config, ... }: let nerdfetch = pkgs.writeShellScriptBin "nerdfetch" '' @@ -346,9 +345,9 @@ let ## USER VARIABLES -- YOU CAN CHANGE THESE - lc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels - nc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels - hn="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels + 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 ic="$reset$white" # info c0="$reset$grey" # first color c1="$reset$white" # second color @@ -367,4 +366,4 @@ let """ ''; -in { home.packages = with pkgs; [ nerdfetch ]; } +in { home.packages = [ nerdfetch ]; } diff --git a/home/system/shell/fzf.nix b/home/system/shell/fzf.nix index d5c9555..7b1f76f 100644 --- a/home/system/shell/fzf.nix +++ b/home/system/shell/fzf.nix @@ -3,12 +3,12 @@ enable = true; enableZshIntegration = true; colors = { - "fg+" = config.theme.colors.primary-ansi-16; + "fg+" = config.var.theme.colors.accentName; "bg+" = "-1"; "fg" = "white"; "bg" = "-1"; "prompt" = "grey"; - "pointer" = config.theme.colors.primary-ansi-16; + "pointer" = config.var.theme.colors.accentName; }; defaultOptions = [ "--margin=1" diff --git a/home/apps/lazygit/default.nix b/home/system/shell/lazygit.nix similarity index 74% rename from home/apps/lazygit/default.nix rename to home/system/shell/lazygit.nix index af723cf..52ff0ec 100644 --- a/home/apps/lazygit/default.nix +++ b/home/system/shell/lazygit.nix @@ -4,7 +4,7 @@ settings = { gui.theme = { ligthTheme = false; - activeBorderColor = [ "${config.theme.colors.primary-ansi-16}" "bold" ]; + activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ]; inactiveBorderColor = [ "black" ]; selectedLineBgColor = [ "default" ]; }; diff --git a/home/apps/lf/config/colors b/home/system/shell/lf/config/colors similarity index 100% rename from home/apps/lf/config/colors rename to home/system/shell/lf/config/colors diff --git a/home/apps/lf/config/icons b/home/system/shell/lf/config/icons similarity index 100% rename from home/apps/lf/config/icons rename to home/system/shell/lf/config/icons diff --git a/home/apps/lf/default.nix b/home/system/shell/lf/default.nix similarity index 100% rename from home/apps/lf/default.nix rename to home/system/shell/lf/default.nix diff --git a/home/system/shell/starship.nix b/home/system/shell/starship.nix index bac7bf8..8935861 100644 --- a/home/system/shell/starship.nix +++ b/home/system/shell/starship.nix @@ -10,10 +10,10 @@ "$git_status" "$character" ]; - directory = { style = "#${config.theme.colors.primary-bg}"; }; + directory = { style = "#${config.var.theme.colors.accent}"; }; character = { - success_symbol = "[❯](#${config.theme.colors.primary-bg})"; + success_symbol = "[❯](#${config.var.theme.colors.accent})"; error_symbol = "[❯](red)"; vimcmd_symbol = "[❮](cyan)"; }; diff --git a/home/apps/tmux/default.nix b/home/system/shell/tmux.nix similarity index 100% rename from home/apps/tmux/default.nix rename to home/system/shell/tmux.nix diff --git a/home/system/shell/zsh.nix b/home/system/shell/zsh.nix index 735571b..4b72ebb 100644 --- a/home/system/shell/zsh.nix +++ b/home/system/shell/zsh.nix @@ -11,9 +11,9 @@ initExtraFirst = '' bindkey -e - ${if config.theme.neofetch == "neofetch" then + ${if config.var.theme.fetch == "neofetch" then pkgs.neofetch + "/bin/neofetch" - else if config.theme.neofetch == "nerdfetch" then + else if config.var.theme.fetch == "nerdfetch" then "nerdfetch" else ""} diff --git a/home/system/sops/laptop.nix b/home/system/sops/laptop.nix index e7f047c..8c40f83 100644 --- a/home/system/sops/laptop.nix +++ b/home/system/sops/laptop.nix @@ -1,16 +1,15 @@ -{ sops-nix, ... }: { +{ pkgs, sops-nix, ... }: { imports = [ sops-nix.homeManagerModules.sops ]; + home.packages = with pkgs; [ sops age ]; + sops = { age.keyFile = "/home/hadi/.config/sops/age/keys.txt"; - defaultSopsFile = ../../../secrets/secrets.yaml; + defaultSopsFile = ../../../secrets/laptop.yaml; secrets = { sshconfig = { path = "/home/hadi/.ssh/config"; }; - oxk = { path = "/home/hadi/.ssh/oxserver"; }; - gk = { path = "/home/hadi/.ssh/github"; }; - glk = { path = "/home/hadi/.ssh/gitlab"; }; - silicon = { path = "/home/hadi/.ssh/silicon"; }; - heaven = { path = "/home/hadi/.ssh/heaven"; }; + github-key = { path = "/home/hadi/.ssh/github"; }; + gitlab-key = { path = "/home/hadi/.ssh/gitlab"; }; }; }; diff --git a/home/system/sops/server.nix b/home/system/sops/server.nix deleted file mode 100644 index a518969..0000000 --- a/home/system/sops/server.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ sops-nix, ... }: { - imports = [ sops-nix.homeManagerModules.sops ]; - - sops = { - age.keyFile = "/home/hadi/.config/sops/age/keys.txt"; - defaultSopsFile = ../../../secrets/secrets.yaml; - secrets = { - gts = { path = "/home/hadi/.ssh/github"; }; - sshconfigheaven = { path = "/home/hadi/.ssh/config"; }; - }; - }; - - systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ]; -} diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix index 3149348..aa0eb66 100644 --- a/home/system/waybar/default.nix +++ b/home/system/waybar/default.nix @@ -12,12 +12,18 @@ layer = "top"; position = "top"; spacing = 0; - "margin-top" = - if config.theme.waybar.float then config.theme.gaps-out else 0; - "margin-left" = - if config.theme.waybar.float then config.theme.gaps-out else 0; - "margin-right" = - if config.theme.waybar.float then config.theme.gaps-out else 0; + "margin-top" = if config.var.theme.waybar.float then + config.var.theme.gaps-out + else + 0; + "margin-left" = if config.var.theme.waybar.float then + config.var.theme.gaps-out + else + 0; + "margin-right" = if config.var.theme.waybar.float then + config.var.theme.gaps-out + else + 0; height = 44; modules-left = [ "custom/logo" "hyprland/window" ]; modules-center = [ "hyprland/workspaces" ]; @@ -125,23 +131,23 @@ border: none; border-radius: 0; min-height: 0; - font-family: "${config.theme.font}"; - color: #${config.theme.colors.fg}; + font-family: "${config.var.theme.font}"; + color: #${config.var.theme.colors.fg}; font-weight: 700; } window#waybar { background-color: ${ - if config.theme.waybar.transparent then + if config.var.theme.waybar.transparent then "rgba(0, 0, 0, 0)" else - "#${config.theme.colors.bg}" + "#${config.var.theme.colors.bg}" }; transition-property: background-color; transition-duration: 0.5s; border-radius: ${ - if config.theme.waybar.float then - toString config.theme.rounding + if config.var.theme.waybar.float then + toString config.var.theme.rounding else "0" }px; @@ -150,12 +156,12 @@ .modules-left, .modules-center, .modules-right { border-radius: ${ - if config.theme.waybar.float then - toString config.theme.rounding + if config.var.theme.waybar.float then + toString config.var.theme.rounding else "0" }px; - background-color: #${config.theme.colors.bg}; + background-color: #${config.var.theme.colors.bg}; padding: 2px 6px; } @@ -174,13 +180,13 @@ padding: 6px 18px; margin: 6px 3px; border-radius: 4px; - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; } #workspaces button.active { - color: #${config.theme.colors.primary-fg}; - background-color: #${config.theme.colors.primary-bg}; + color: #${config.var.theme.colors.accentFg}; + background-color: #${config.var.theme.colors.accent}; } #workspaces button:hover { @@ -190,11 +196,11 @@ } #workspaces button.urgent { - background-color: #${config.theme.colors.color1}; + background-color: #${config.var.theme.colors.c1}; } #window > * { - font-family: "${config.theme.font-mono}"; + font-family: "${config.var.theme.font-mono}"; } #memory, @@ -209,19 +215,19 @@ border-radius: 9px; margin: 6px 3px; padding: 6px 12px; - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; } #tray menu { - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; } #custom-logo { padding-right: 7px; font-size: 15px; - color: #${config.theme.colors.primary-bg}; + color: #${config.var.theme.colors.accent}; } @keyframes blink { @@ -244,28 +250,28 @@ } #battery.charging { - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; animation: none; } #custom-power { - background-color: #${config.theme.colors.primary-bg}; - color: #${config.theme.colors.primary-fg}; + background-color: #${config.var.theme.colors.accent}; + color: #${config.var.theme.colors.accentFg}; } tooltip { border-radius: 8px; padding: 15px; - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; } tooltip label { padding: 5px; - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; } ''; }; diff --git a/home/system/wlogout/default.nix b/home/system/wlogout/default.nix index 08f3ecf..8b6ca3c 100644 --- a/home/system/wlogout/default.nix +++ b/home/system/wlogout/default.nix @@ -43,7 +43,7 @@ style = '' * { - font-family: "${config.theme.font}"; + font-family: "${config.var.theme.font}"; background-image: none; transition: 20ms; } @@ -53,23 +53,23 @@ } button { - color: #${config.theme.colors.fg}; + color: #${config.var.theme.colors.fg}; font-size:20px; background-repeat: no-repeat; background-position: center; background-size: 25%; - border: 3px solid #${config.theme.colors.bg}; - background-color: #${config.theme.colors.bg}; + 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.theme.colors.primary-fg}; - background-color: #${config.theme.colors.primary-bg}; - border: 3px solid #${config.theme.colors.primary-bg}; + color: #${config.var.theme.colors.accentFg}; + background-color: #${config.var.theme.colors.accent}; + border: 3px solid #${config.var.theme.colors.accent}; } /* @@ -80,7 +80,7 @@ #lock,#logout,#suspend,#hibernate,#shutdown,#reboot { margin: 10px; - border-radius: ${toString config.theme.rounding}px; + border-radius: ${toString config.var.theme.rounding}px; } #lock { diff --git a/home/apps/wofi/default.nix b/home/system/wofi/default.nix similarity index 68% rename from home/apps/wofi/default.nix rename to home/system/wofi/default.nix index 02b0cb2..17817ae 100644 --- a/home/apps/wofi/default.nix +++ b/home/system/wofi/default.nix @@ -35,15 +35,15 @@ /** ********** Fonts ********** **/ * { - font-family: "${config.theme.font}"; + font-family: "${config.var.theme.font}"; font-weight: 500; font-size: 12px; } #window { - background-color: #${config.theme.colors.alt-bg}; - color: #${config.theme.colors.alt-fg}; - border-radius: ${toString config.theme.rounding}px; + background-color: #${config.var.theme.colors.bgalt}; + color: #${config.var.theme.colors.fgalt}; + border-radius: ${toString config.var.theme.rounding}px; } #outer-box { @@ -51,8 +51,8 @@ } #input { - background-color: #${config.theme.colors.bg}; - border: 0px solid #${config.theme.colors.primary-bg}; + background-color: #${config.var.theme.colors.bg}; + border: 0px solid #${config.var.theme.colors.accent}; padding: 8px 12px; } @@ -67,11 +67,11 @@ } #text { - color: #${config.theme.colors.color7}; + color: #${config.var.theme.colors.c7}; } #text:selected { - color: #${config.theme.colors.fg}; + color: #${config.var.theme.colors.fg}; } #entry { @@ -79,8 +79,8 @@ } #entry:selected { - background-color: #${config.theme.colors.primary-bg}; - color: #${config.theme.colors.primary-fg}; + background-color: #${config.var.theme.colors.accent}; + color: #${config.var.theme.colors.accentFg}; } #unselected {} @@ -89,7 +89,7 @@ #input, #entry:selected { - border-radius: ${toString config.theme.rounding}px; + border-radius: ${toString config.var.theme.rounding}px; } ''; }; diff --git a/home/themes/config/load_colors.nix b/home/themes/config/load_colors.nix deleted file mode 100644 index 08ec008..0000000 --- a/home/themes/config/load_colors.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ config, ... }: { - config.theme.colors.primary-ansi-16-number = - if config.theme.colors.primary-ansi-16 == "black" then - 0 - else if config.theme.colors.primary-ansi-16 == "red" then - 1 - else if config.theme.colors.primary-ansi-16 == "green" then - 2 - else if config.theme.colors.primary-ansi-16 == "yellow" then - 3 - else if config.theme.colors.primary-ansi-16 == "blue" then - 4 - else if config.theme.colors.primary-ansi-16 == "magenta" then - 5 - else if config.theme.colors.primary-ansi-16 == "cyan" then - 6 - else if config.theme.colors.primary-ansi-16 == "white" then - 7 - else if config.theme.colors.primary-ansi-16 == "bright-white" then - 8 - else if config.theme.colors.primary-ansi-16 == "bright-black" then - 9 - else if config.theme.colors.primary-ansi-16 == "bright-red" then - 10 - else if config.theme.colors.primary-ansi-16 == "bright-green" then - 11 - else if config.theme.colors.primary-ansi-16 == "bright-yellow" then - 12 - else if config.theme.colors.primary-ansi-16 == "bright-blue" then - 13 - else if config.theme.colors.primary-ansi-16 == "bright-magenta" then - 14 - else if config.theme.colors.primary-ansi-16 == "bright-cyan" then - 15 - else - 0; - -} diff --git a/home/themes/config/load_wallpapers.nix b/home/themes/config/load_wallpapers.nix deleted file mode 100644 index 78f7b8b..0000000 --- a/home/themes/config/load_wallpapers.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - xdg.configFile."wallpapers" = { - recursive = true; - source = ../wallpapers; - }; -} diff --git a/home/themes/config/template.nix b/home/themes/config/template.nix deleted file mode 100644 index 65520a5..0000000 --- a/home/themes/config/template.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib, ... }: -with lib; { - options.theme = { - - waybar = { - transparent = mkOption { - type = types.bool; - description = "Does waybar have a transparent background?"; - }; - - float = mkOption { - type = types.bool; - description = "Floating mode for waybar (gap)"; - }; - }; - - animation-speed = mkOption { - type = types.str; - description = "Options: slow/medium/fast"; - }; - - neofetch = mkOption { - type = types.str; - description = "Options: neofetch/nerdfetch/none"; - }; - - wallpaper = mkOption { - type = types.str; - description = "Name of the wallpaper (from the wallpapers directory)"; - }; - - font = mkOption { - type = types.str; - description = "Default font"; - }; - - font-mono = mkOption { - type = types.str; - description = "Default mono font"; - }; - - rounding = mkOption { - type = types.int; - description = "Borders rounding"; - }; - - gaps-in = mkOption { - type = types.int; - description = "Gaps in"; - }; - - gaps-out = mkOption { - type = types.int; - description = "Gaps out"; - }; - - border-size = mkOption { - type = types.int; - description = "Border size"; - }; - - colors = let - mkColorOption = name: { - inherit name; - value = mkOption { - type = types.strMatching "[a-fA-F0-9]{6}"; - description = "Color ${name}."; - }; - }; - in listToAttrs (map mkColorOption [ - "bg" - "fg" - "alt-bg" - "alt-fg" - "primary-bg" - "primary-fg" - "secondary-bg" - "secondary-fg" - "color0" - "color1" - "color2" - "color3" - "color4" - "color5" - "color6" - "color7" - "color8" - "color9" - "color10" - "color11" - "color12" - "color13" - "color14" - "color15" - ]) // { - primary-ansi-16 = mkOption { - type = types.str; - description = - "Name of the primary color - ansi 16 colors (black, red, green, yellow, blue, magenta, cyan, white, bright-black, bright-red, bright-green, bright-yellow, bright-blue, bright-magenta, bright-cyan, bright-white)"; - }; - - primary-ansi-16-number = mkOption { - type = types.int; - description = "Set the primary color - ansi 16 colors (0-15)"; - }; - - }; - }; -} diff --git a/home/themes/heaven.nix b/home/themes/heaven.nix deleted file mode 100644 index 42d0f1b..0000000 --- a/home/themes/heaven.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - imports = [ ./config/template.nix ./config/load_colors.nix ]; - - theme = { - wallpaper = "default.png"; - - font-mono = "FiraCode Nerd Font Mono"; - font = "SFProDisplay Nerd Font"; - - rounding = 12; - gaps-in = 10; - gaps-out = 20; - border-size = 3; - - neofetch = "nerdfetch"; - - waybar = { - transparent = true; - float = true; - }; - - colors = { - bg = "040409"; - fg = "FCFCFC"; - alt-bg = "101012"; - alt-fg = "ECECEC"; - - primary-ansi-16 = "red"; - primary-bg = "a158ff"; - primary-fg = "000000"; - - secondary-bg = "4928B8"; - secondary-fg = "000000"; - - # Black - color0 = "000000"; - # Red - color1 = "f7768e"; - # Green - color2 = "73daca"; - # Yellow - color3 = "e0af68"; - # Blue - color4 = "7aa2f7"; - # Magenta - color5 = "a158ff"; - # Cyan - color6 = "7dcfff"; - # White - color7 = "E4E5E7"; - - # Bright - color8 = "515878"; - color9 = "f7869e"; - color10 = "83eada"; - color11 = "f0bf78"; - color12 = "8ab2f7"; - color13 = "A988F8"; - color14 = "8ddfff"; - color15 = "f4f5f7"; - }; - }; - -} diff --git a/home/themes/nixy.nix b/home/themes/nixy.nix deleted file mode 100644 index 7fc337a..0000000 --- a/home/themes/nixy.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - imports = [ ./config/template.nix ./config/load_colors.nix ]; - - theme = { - wallpaper = "default.png"; - - font-mono = "FiraCode Nerd Font Mono"; - font = "SFProDisplay Nerd Font"; - - rounding = 12; - gaps-in = 10; - gaps-out = 20; - border-size = 3; - - neofetch = "nerdfetch"; - - waybar = { - transparent = true; - float = true; - }; - - colors = { - bg = "040409"; - fg = "FCFCFC"; - alt-bg = "101012"; - alt-fg = "ECECEC"; - - primary-ansi-16 = "magenta"; - primary-bg = "a158ff"; - primary-fg = "000000"; - - secondary-bg = "4928B8"; - secondary-fg = "000000"; - - # Black - color0 = "000000"; - # Red - color1 = "f7768e"; - # Green - color2 = "73daca"; - # Yellow - color3 = "e0af68"; - # Blue - color4 = "7aa2f7"; - # Magenta - color5 = "a158ff"; - # Cyan - color6 = "7dcfff"; - # White - color7 = "E4E5E7"; - - # Bright - color8 = "515878"; - color9 = "f7869e"; - color10 = "83eada"; - color11 = "f0bf78"; - color12 = "8ab2f7"; - color13 = "A988F8"; - color14 = "8ddfff"; - color15 = "f4f5f7"; - }; - }; - -} diff --git a/home/themes/wallpapers/Lofi-Computer.png b/home/themes/wallpapers/Lofi-Computer.png deleted file mode 100644 index f0e78e6..0000000 Binary files a/home/themes/wallpapers/Lofi-Computer.png and /dev/null differ diff --git a/home/themes/wip.nix b/home/themes/wip.nix deleted file mode 100644 index 45dd360..0000000 --- a/home/themes/wip.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - imports = [ ./config/template.nix ./config/load_colors.nix ]; - - theme = { - wallpaper = "Fuji-Light.png"; - - font-mono = "FiraCode Nerd Font Mono"; - font = "SFProDisplay Nerd Font"; - - rounding = 8; - gaps-in = 6; - gaps-out = 12; - border-size = 2; - - neofetch = "nerdfetch"; - - waybar = { - transparent = false; - float = false; - }; - - colors = { - bg = "040409"; - fg = "FCFCFC"; - alt-bg = "101012"; - alt-fg = "ECECEC"; - - primary-ansi-16 = "cyan"; - primary-bg = "bbcde5"; - primary-fg = "000000"; - - secondary-bg = "4928B8"; - secondary-fg = "000000"; - - # Black - color0 = "000000"; - # Red - color1 = "f7768e"; - # Green - color2 = "73daca"; - # Yellow - color3 = "e0af68"; - # Blue - color4 = "7aa2f7"; - # Magenta - color5 = "9978F8"; - # Cyan - color6 = "bbcde5"; - # White - color7 = "E4E5E7"; - - # Bright - color8 = "515878"; - color9 = "f7869e"; - color10 = "83eada"; - color11 = "f0bf78"; - color12 = "8ab2f7"; - color13 = "A988F8"; - color14 = "ccdef6"; - color15 = "f4f5f7"; - }; - }; - -} diff --git a/home/themes/wallpapers/Fuji-Dark.png b/home/wallpapers/Fuji-Dark.png similarity index 100% rename from home/themes/wallpapers/Fuji-Dark.png rename to home/wallpapers/Fuji-Dark.png diff --git a/home/themes/wallpapers/Fuji-Light.png b/home/wallpapers/Fuji-Light.png similarity index 100% rename from home/themes/wallpapers/Fuji-Light.png rename to home/wallpapers/Fuji-Light.png diff --git a/home/wallpapers/Lofi-Computer.png b/home/wallpapers/Lofi-Computer.png new file mode 100644 index 0000000..574be4c Binary files /dev/null and b/home/wallpapers/Lofi-Computer.png differ diff --git a/home/themes/wallpapers/Lofi-Urban-Nightscape.png b/home/wallpapers/Lofi-Urban-Nightscape.png similarity index 100% rename from home/themes/wallpapers/Lofi-Urban-Nightscape.png rename to home/wallpapers/Lofi-Urban-Nightscape.png diff --git a/home/themes/wallpapers/barcode.png b/home/wallpapers/barcode.png similarity index 100% rename from home/themes/wallpapers/barcode.png rename to home/wallpapers/barcode.png diff --git a/home/themes/wallpapers/cat_leaves.png b/home/wallpapers/cat_leaves.png similarity index 100% rename from home/themes/wallpapers/cat_leaves.png rename to home/wallpapers/cat_leaves.png diff --git a/home/themes/wallpapers/cloud.png b/home/wallpapers/cloud.png similarity index 100% rename from home/themes/wallpapers/cloud.png rename to home/wallpapers/cloud.png diff --git a/home/themes/wallpapers/default.png b/home/wallpapers/default.png similarity index 100% rename from home/themes/wallpapers/default.png rename to home/wallpapers/default.png diff --git a/home/themes/wallpapers/galaxy.png b/home/wallpapers/galaxy.png similarity index 100% rename from home/themes/wallpapers/galaxy.png rename to home/wallpapers/galaxy.png diff --git a/home/themes/wallpapers/house_cloud.png b/home/wallpapers/house_cloud.png similarity index 100% rename from home/themes/wallpapers/house_cloud.png rename to home/wallpapers/house_cloud.png diff --git a/home/themes/wallpapers/mountains.png b/home/wallpapers/mountains.png similarity index 100% rename from home/themes/wallpapers/mountains.png rename to home/wallpapers/mountains.png diff --git a/home/themes/wallpapers/mountains_black.png b/home/wallpapers/mountains_black.png similarity index 100% rename from home/themes/wallpapers/mountains_black.png rename to home/wallpapers/mountains_black.png diff --git a/home/themes/wallpapers/tokyo.png b/home/wallpapers/tokyo.png similarity index 100% rename from home/themes/wallpapers/tokyo.png rename to home/wallpapers/tokyo.png diff --git a/home/themes/wallpapers/windows.png b/home/wallpapers/windows.png similarity index 100% rename from home/themes/wallpapers/windows.png rename to home/wallpapers/windows.png diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 50448f5..472d6db 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,18 +1,14 @@ -{ pkgs, config, ... }: -let - variable = import ../../variables.nix; - baseImports = [ ./hardware-configuration.nix ]; - - extraImports = [ - (if variable.enableNvidia then ./nvidia.nix else null) - (if variable.enablePrime then ./prime.nix else null) +{ pkgs, config, ... }: { + imports = [ + ./hardware-configuration.nix + ../shared/fonts.nix + # ../shared/nvidia.nix + # ../shared/prime.nix + ../shared/testnvidia.nix + ../shared/tuigreet.nix + ./variables.nix ]; - filteredImports = builtins.filter (x: x != null) extraImports; - -in { - imports = baseImports ++ filteredImports; - # Bootloader. boot = { loader.efi.canTouchEfiVariables = true; @@ -21,42 +17,48 @@ in { consoleMode = "auto"; }; tmp.cleanOnBoot = true; + kernelPackages = + pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc. }; + # Networking networking.networkmanager.enable = true; + networking.hostName = config.var.hostname; - networking.hostName = variable.hostName; - - time.timeZone = variable.timeZone; - i18n.defaultLocale = variable.defaultLocale; + # Timezone and locale + time.timeZone = config.var.timeZone; + i18n.defaultLocale = config.var.defaultLocale; i18n.extraLocaleSettings = { - LC_ADDRESS = variable.extraLocale; - LC_IDENTIFICATION = variable.extraLocale; - LC_MEASUREMENT = variable.extraLocale; - LC_MONETARY = variable.extraLocale; - LC_NAME = variable.extraLocale; - LC_NUMERIC = variable.extraLocale; - LC_PAPER = variable.extraLocale; - LC_TELEPHONE = variable.extraLocale; - LC_TIME = variable.extraLocale; + LC_ADDRESS = config.var.extraLocale; + LC_IDENTIFICATION = config.var.extraLocale; + LC_MEASUREMENT = config.var.extraLocale; + LC_MONETARY = config.var.extraLocale; + LC_NAME = config.var.extraLocale; + LC_NUMERIC = config.var.extraLocale; + LC_PAPER = config.var.extraLocale; + LC_TELEPHONE = config.var.extraLocale; + LC_TIME = config.var.extraLocale; }; - users.users.${variable.username} = { + # Users + users.users.${config.var.username} = { isNormalUser = true; - description = "${variable.username} account"; + description = "${config.var.username} account"; extraGroups = [ "networkmanager" "wheel" ]; }; services = { xserver = { - xkb.layout = variable.keyboardLayout; + enable = true; + xkb.layout = config.var.keyboardLayout; xkb.variant = ""; }; blueman.enable = true; gnome.gnome-keyring.enable = true; }; - console.keyMap = variable.keyboardLayout; + console.keyMap = config.var.keyboardLayout; + # Shell programs.zsh = { enable = true; loginShellInit = '' @@ -65,24 +67,6 @@ in { }; users.defaultUserShell = pkgs.zsh; - # faster rebuilding - documentation = { - enable = true; - doc.enable = false; - man.enable = true; - dev.enable = false; - }; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - environment.systemPackages = with pkgs; [ networkmanagerapplet ]; - - nixpkgs.config.permittedInsecurePackages = [ - "electron-25.9.0" - "nix-2.16.2" - ]; # TODO: Remove this if not needed anymore - hardware.bluetooth = { enable = true; powerOnBoot = true; @@ -118,8 +102,12 @@ in { settings = { auto-optimise-store = true; experimental-features = [ "nix-command" "flakes" ]; + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + ]; }; - gc = if variable.enableAutoGarbageCollector then { + gc = if config.var.autoGarbageCollector then { automatic = true; persistent = true; dates = "weekly"; @@ -128,22 +116,37 @@ in { { }; }; - system.autoUpgrade = if variable.enableAutoUpgrade then { + nixpkgs.config.allowUnfree = true; + environment.systemPackages = with pkgs; [ networkmanagerapplet ]; + nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ]; + + system.autoUpgrade = if config.var.autoUpgrade then { enable = true; dates = "04:00"; - flake = "${config.users.users.${variable.username}.home}/.config/nixos"; + flake = "${config.users.users.${config.var.username}.home}/.config/nixos"; flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ]; allowReboot = false; } else { }; - nix.settings = { - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = - [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + xdg.portal = { + enable = true; + configPackages = with pkgs; [ xdg-desktop-portal-gtk ]; + }; + + services.libinput.enable = true; + programs.dconf.enable = true; + + # Faster rebuilding + documentation = { + enable = true; + doc.enable = false; + man.enable = true; + dev.enable = false; }; services.dbus.enable = true; - system.stateVersion = variable.stateVersion; + # Don't touch this + system.stateVersion = "24.05"; } diff --git a/hosts/laptop/prime.nix b/hosts/laptop/prime.nix deleted file mode 100644 index 350adcc..0000000 --- a/hosts/laptop/prime.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - hardware.nvidia.prime = { - offload = { - enable = true; - enableOffloadCmd = true; - }; - - # sync.enable = true; - - amdgpuBusId = "PCI:5:0:0"; - nvidiaBusId = "PCI:1:0:0"; - }; -} diff --git a/hosts/laptop/tailscale.nix b/hosts/laptop/tailscale.nix deleted file mode 100644 index f11eab6..0000000 --- a/hosts/laptop/tailscale.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - services.tailscale = { - enable = true; - authKeyFile = "/etc/tailscalepwd"; - }; -} diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix new file mode 100644 index 0000000..f72eb88 --- /dev/null +++ b/hosts/laptop/variables.nix @@ -0,0 +1,79 @@ +{ config, ... }: { + imports = [ ../shared/variables-config.nix ]; + + config.var = { + hostname = "nixy"; + username = "hadi"; + homeDirectory = "/home/" + config.var.username; + + 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"; + }; + + stateVersion = "24.05"; + + autoUpgrade = false; + autoGarbageCollector = false; + sops = true; + nextcloud = true; + nvidia = true; + nvidiaPrime = true; + + theme = { + wallpaper = "Lofi-Computer.png"; + + font-mono = "FiraCode Nerd Font Mono"; + font = "SFProDisplay Nerd Font"; + + rounding = 15; + gaps-in = 12; + gaps-out = config.var.theme.gaps-in * 2; + border-size = 4; + + fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "none" + + waybar = { + transparent = true; + float = true; + }; + + colors = { + c0 = "2F2F2F"; # black + c1 = "f7768e"; # red + c2 = "73daca"; # green + c3 = "e0af68"; # yellow + c4 = "4973CB"; # blue + c5 = "A594FD"; # magenta + c6 = "7dcfff"; # cyan + c7 = "FFFFFF"; # white + c8 = "3F3F3F"; # bright black + c9 = "f7869e"; # bright red + c10 = "83eada"; # bright green + c11 = "f0bf78"; # bright yellow + c12 = "8ab2f7"; # bright blue + c13 = "A988F8"; # bright magenta + c14 = "8ddfff"; # bright cyan + c15 = "f4f5f7"; # bright white + + bg = "040404"; + fg = config.var.theme.colors.c7; + bgalt = "131313"; + fgalt = config.var.theme.colors.c15; + + accent = config.var.theme.colors.c4; + accentFg = config.var.theme.colors.c0; + + # Should make those automtic + accentName = "blue"; + accentNumber = "4"; + }; + }; + }; +} diff --git a/hosts/server/cloudflared.nix b/hosts/server/cloudflared.nix deleted file mode 100644 index aa8eccc..0000000 --- a/hosts/server/cloudflared.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ cloudflared ]; - services.cloudflared = { - enable = true; - tunnels = { - "55ac0504-4ba0-4ea7-bf38-6d04ca7e45c3" = { - credentialsFile = "/etc/cloudflaredpwd"; - default = "http_status:404"; - ingress = { }; - }; - }; - }; -} diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix deleted file mode 100644 index 3ff0c74..0000000 --- a/hosts/server/configuration.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ pkgs, config, ... }: -let variable = import ../../variables.nix; -in { - imports = [ - ./hardware-configuration.nix - ./openssh.nix - ./nextcloud.nix - ./firewall.nix - ./nginx.nix - ./cloudflared.nix - ./tailscale.nix - ]; - - boot = { - loader.efi.canTouchEfiVariables = true; - loader.systemd-boot = { - enable = true; - consoleMode = "auto"; - }; - tmp.cleanOnBoot = true; - }; - - networking.hostName = variable.server.hostName; - - time.timeZone = variable.timeZone; - i18n.defaultLocale = variable.defaultLocale; - i18n.extraLocaleSettings = { - LC_ADDRESS = variable.extraLocale; - LC_IDENTIFICATION = variable.extraLocale; - LC_MEASUREMENT = variable.extraLocale; - LC_MONETARY = variable.extraLocale; - LC_NAME = variable.extraLocale; - LC_NUMERIC = variable.extraLocale; - LC_PAPER = variable.extraLocale; - LC_TELEPHONE = variable.extraLocale; - LC_TIME = variable.extraLocale; - }; - - users.users.${variable.username} = { - isNormalUser = true; - description = "${variable.username} account"; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBVDICWA/+W3Qqgoxw6pIwPAjRmTYKWnsEPD/cRTNgzP hadi@heaven" - ]; - }; - - console.keyMap = variable.keyboardLayout; - - programs.zsh.enable = true; - users.defaultUserShell = pkgs.zsh; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - security.rtkit.enable = true; - - nix = { - settings = { - auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; - }; - gc = if variable.server.enableAutoGarbageCollector then { - automatic = true; - persistent = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - } else - { }; - }; - - system.autoUpgrade = if variable.server.enableAutoUpgrade then { - enable = true; - dates = "04:00"; - flake = "${config.users.users.${variable.username}.home}/.config/nixos"; - flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ]; - allowReboot = false; - } else - { }; - - nix.settings = { - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = - [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; - }; - - services.dbus.enable = true; - - system.stateVersion = variable.server.stateVersion; -} diff --git a/hosts/server/firewall.nix b/hosts/server/firewall.nix deleted file mode 100644 index 75763b7..0000000 --- a/hosts/server/firewall.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - - services.fail2ban = { - enable = true; - maxretry = 3; - ignoreIP = [ "127.0.0.0/8" "10.0.0.0/8" "192.168.0.0/16" ]; - }; - - networking.firewall = { - enable = true; - allowedTCPPorts = [ 22 ]; - }; -} diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix deleted file mode 100644 index 58cbb5d..0000000 --- a/hosts/server/hardware-configuration.nix +++ /dev/null @@ -1,38 +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 + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/7c6e7955-f1bb-474e-bd86-bbf66c4168fd"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/89E0-5218"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - 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.enp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/server/nextcloud.nix b/hosts/server/nextcloud.nix deleted file mode 100644 index c2b9e3c..0000000 --- a/hosts/server/nextcloud.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, config, ... }: { - - environment.systemPackages = with pkgs; [ nextcloud29 ]; - - services.nextcloud = { - enable = true; - package = pkgs.nextcloud29; - hostName = "cloud.anotherhadi.com"; - config.adminpassFile = "/etc/nextcloudpwd"; - https = true; - }; - - services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { - forceSSL = false; - enableACME = false; - locations."/" = { - proxyPass = "http://localhost:8080"; - proxyWebsockets = true; - }; - }; -} diff --git a/hosts/server/nginx.nix b/hosts/server/nginx.nix deleted file mode 100644 index 86a7164..0000000 --- a/hosts/server/nginx.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - }; - - networking.firewall = { allowedTCPPorts = [ 80 443 ]; }; -} diff --git a/hosts/server/ntfy.nix b/hosts/server/ntfy.nix deleted file mode 100644 index 69ce780..0000000 --- a/hosts/server/ntfy.nix +++ /dev/null @@ -1 +0,0 @@ -{ services.ntfy = { enable = true; }; } diff --git a/hosts/server/openssh.nix b/hosts/server/openssh.nix deleted file mode 100644 index 9693a42..0000000 --- a/hosts/server/openssh.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - services.openssh = { - enable = true; - permitRootLogin = "no"; - passwordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - ports = [ 22 ]; - banner = '' - HEAVEN: - - This system is for the use of authorized users only. Individuals using this - computer system without authority, or in excess of their authority, are - subject to having all of their activities on this system monitored and - recorded by system personnel. - - In the course of monitoring individuals improperly using this system, or in - the course of system maintenance, the activities of authorized users may also - be monitored. - - Anyone using this system expressly consents to such monitoring and is advised - that if such monitoring reveals possible evidence of criminal activity, - system personnel may provide the evidence of such monitoring to law - enforcement officials. - ''; - }; -} diff --git a/hosts/server/pihole.nix b/hosts/server/pihole.nix deleted file mode 100644 index e69de29..0000000 diff --git a/hosts/server/tailscale.nix b/hosts/server/tailscale.nix deleted file mode 100644 index 30f7305..0000000 --- a/hosts/server/tailscale.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - services.tailscale = { - enable = true; - useRoutingFeatures = "server"; - }; -} diff --git a/hosts/server/vaultwarden.nix b/hosts/server/vaultwarden.nix deleted file mode 100644 index 8304371..0000000 --- a/hosts/server/vaultwarden.nix +++ /dev/null @@ -1,21 +0,0 @@ -let - port = 8222; - signup = false; -in { - services.vaultwarden = { - enable = true; - config = { - DOMAIN = "https://bw.anotherhadi.com"; - SIGNUPS_ALLOWED = signup; - ROCKET_ADDRESS = "127.0.0.1"; - ROCKET_PORT = port; - ROCKET_LOG = "critical"; - }; - }; - - services.nginx.virtualHosts."bw.anotherhadi.com" = { - locations."/" = { proxyPass = "http://127.0.0.1:${toString port}"; }; - }; - - networking.firewall.allowedTCPPorts = [ port ]; -} diff --git a/hosts/laptop/fonts.nix b/hosts/shared/fonts.nix similarity index 100% rename from hosts/laptop/fonts.nix rename to hosts/shared/fonts.nix diff --git a/hosts/laptop/nvidia.nix b/hosts/shared/nvidia.nix similarity index 81% rename from hosts/laptop/nvidia.nix rename to hosts/shared/nvidia.nix index 7e7bdff..25ece68 100644 --- a/hosts/laptop/nvidia.nix +++ b/hosts/shared/nvidia.nix @@ -12,10 +12,10 @@ hardware.nvidia = { modesetting.enable = true; - powerManagement.enable = false; + powerManagement.enable = true; powerManagement.finegrained = false; open = false; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.production; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; } diff --git a/hosts/shared/prime.nix b/hosts/shared/prime.nix new file mode 100644 index 0000000..f6bd772 --- /dev/null +++ b/hosts/shared/prime.nix @@ -0,0 +1,13 @@ +{ + hardware.nvidia.prime = { + # offload = { + # enable = true; + # enableOffloadCmd = true; + # }; + + sync.enable = true; + + amdgpuBusId = "PCI:5:0:0"; + nvidiaBusId = "PCI:1:0:0"; + }; +} diff --git a/hosts/shared/testnvidia.nix b/hosts/shared/testnvidia.nix new file mode 100644 index 0000000..579de2c --- /dev/null +++ b/hosts/shared/testnvidia.nix @@ -0,0 +1,52 @@ +{ lib, pkgs, config, ... }: +let + nvidiaDriverChannel = + config.boot.kernelPackages.nvidiaPackages.beta; # stable, latest, etc. +in { + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = [ "nvidia" ]; # or "nvidiaLegacy470 etc. + boot.kernelParams = + lib.optionals (lib.elem "nvidia" config.services.xserver.videoDrivers) [ + "nvidia-drm.modeset=1" + "nvidia_drm.fbdev=1" + ]; + environment.variables = { + VK_DRIVER_FILES = + /run/opengl-driver/share/vulkan/icd.d/nvidia_icd.x86_64.json; + GBM_BACKEND = "nvidia-drm"; + WLR_NO_HARDWARE_CURSORS = "1"; + LIBVA_DRIVER_NAME = "nvidia"; # hardware acceleration + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + }; + nixpkgs.config = { + nvidia.acceptLicense = true; + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "cudatoolkit" + "nvidia-persistenced" + "nvidia-settings" + "nvidia-x11" + ]; + }; + hardware = { + nvidia = { + open = false; + nvidiaSettings = false; + powerManagement.enable = + false; # This can cause sleep/suspend to fail and saves entire VRAM to /tmp/ + modesetting.enable = true; + package = nvidiaDriverChannel; + }; + opengl = { + enable = true; + package = nvidiaDriverChannel; + driSupport = true; + driSupport32Bit = true; + extraPackages = with pkgs; [ + nvidia-vaapi-driver + vaapiVdpau + libvdpau-va-gl + ]; + }; + }; +} diff --git a/hosts/laptop/tuigreet.nix b/hosts/shared/tuigreet.nix similarity index 100% rename from hosts/laptop/tuigreet.nix rename to hosts/shared/tuigreet.nix diff --git a/hosts/shared/variables-config.nix b/hosts/shared/variables-config.nix new file mode 100644 index 0000000..7a54f2e --- /dev/null +++ b/hosts/shared/variables-config.nix @@ -0,0 +1,8 @@ +{ lib, ... }: { + options = { + var = lib.mkOption { + type = lib.types.attrs; + default = { }; + }; + }; +} diff --git a/secrets/laptop.yaml b/secrets/laptop.yaml new file mode 100644 index 0000000..8d6916a --- /dev/null +++ b/secrets/laptop.yaml @@ -0,0 +1,23 @@ +sshconfig: ENC[AES256_GCM,data:NJBCn27rgJi6tt53blTomEWk9ZvsT/k8ui1SJMbw38ZYasjEfI8I5NEgl/17cnAAqlgllYvfzALuD/6fBSx5UHw6w6GtxGangt0xzwo7IpeHMbn95JT9uqukM6YETN0RaKwpyKzYTrOvug4AtEvfebOmUN7YsXjI52Zfq+Hx0p2zQNdAzS2OaCzA1qLWrtxCqXbnmFRKL3wDBeiiedMlq+1ISn94gJf9FgrgMeboy8m4+xU1TweBTm3ryzeYm2oBcni6bLbsFPgH2dYUMU184BcmUKyPnZLz/eBXGP9XW3wIml5YscRKxXMn+zhSmz5MkfpVdz45dPmoONlyvDXAgVdve/+SAXYCC7rrRfZ2W0JkbvQYY9DhE6Ypac/Icp0hMCxz7uUxD6x1feLy,iv:jD/uDPaGWkGjp8g5Zp+mdu8i1g4IP8DPssH5Y+Bs5jg=,tag:k4sLHcSawgBpDt/0DiLBSA==,type:str] +github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str] +gitlab-key: ENC[AES256_GCM,data:6271Tg7LIJsXAw7Co32vva+iUWv+eRAfVfXaGkoirHxiPTAgZfq8yDpGJwti2D/aFnLvbURcUgp3B5zy1aURu9puXi6QMu3orJOE2Zx0dX3lyeHyIhOZ1hAWsQxwBDkJYODuMZbIKHNrF26Mkk6smFF9SrGoADZGxY7XSou/iopw6yrLvQAXP6lN55PQvoP5/ek/QzKNwjJAbAjp7FjjtPqPUbUdj7bfIfr9avs6gpRYnRzb2H3auyhb5qvyuRWnKu4+FeZUofC7HnfRU1eSI8UzG49Rg4f2b1Xqr0JtsjvEmuRx7lbptINXEAjW7zaSZ2B9NgotWPIzkNZRNZkuTEaOulBf5iH3wJ9GM1FcbUu2gpCt6y+CMIk5QkVvETYtKuALLbcPx9/sc90doiH1411LeKQCs5l88BBILG9KPkKmXiGGUVNxzFtjbRYQIUEmmyl95kPPEdCkkzGzHXNfE3F9HRu4MCGKPK2yZPZtCXd3Jp1b21wKSIRNYqLqxru+J8eLSljd3czO0SuTG/Vx,iv:E+y3aVLaiStlPLTQBqyfJuEXtAQyOvDUYS+XfuOHuA0=,tag:6d1IAsGcmcpgL1pE9dDcbw==,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-06-14T00:58:02Z" + mac: ENC[AES256_GCM,data:+kfbw85KY9+HKgpXWEtLo69A6V/tzDzqGEwZUSK3paqKweMB9/qjjfttViqb+CJpJ9UXC+pXBKD+G+eCVjz0sO8zuulf/95+20XZx/IQHNHqLMzoJSSMNEpJVo8LgYaiRDwKkRh8AaWrAvEGSNWckf5ftl+krLasXu60o8835og=,iv:FEDkZKznyvqxw+YEzH3m0I5MS99LDI31DYeDn5OjQEo=,tag:EdQk5Q8PGSnKXO3p8yJrwg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml deleted file mode 100644 index f2c66b6..0000000 --- a/secrets/secrets.yaml +++ /dev/null @@ -1,28 +0,0 @@ -sshconfig: ENC[AES256_GCM,data:+TrjU05vWgBwkQZ0zlxUx/RCYCsJDAJnNFE18Izu9en6Bn1fPFKqQvn6qksBb8zjS98nVMCfBas0zrNTwBaIR5jpBZjBHlhmojVHp2R8y3QYKzDrah1ASjwR+t+32+WUOZT57h+DIMww6WppzJPeU6xBYooGTH771GkHotrzYEh8rCasTFRQDo9Z13+RiMZnI2l0mpSpWMHzNEZVy3DLlu9tm3H3sCrqLABjGyTj3uf+vorRDCUDOu7RjWa3LWBx5RWOjMMfc8/yLW3GV8DEAhluLXzm0AwReh8bg8zJySvYpy92e5P4tAi4ykR1pWK36JtPea7VeGBcHSZEOkHcktt5sGB7HEkhfWY5B/e7JgilrXHWHsoGzbTt1H6xhILfdSkEBBFn9ih4r4k63qPubCjyVUnAjAV3EGjGm62e7swdLcfODBHwtv1KAxzxKI+rDjKPEy8o0RBxh31DJ83u00q1Tu2I1EwtPrOI8wA+rOH1u/Bzw4dIGhSklArykvmUCSkBaaixWKM7fsO9bUTf9cgQ95eLOBC+GBsNmXXSC46I8vQaEmzjWdi9tCn5yWYTIUsQsh8OhPA90mL886hoE7+slz+EQ+2eENPNwi0ok2UTxU5C9D94sAqMMolQq5Ab3zapKdz0sgur7B9guW9+MpSQTbeA1nvA9wjKwHCu60QPF8/hUFNLRhw85AVua44eDKoC4WOVfgouXdHfFaoDGdFzBO2CgGPxE61yZ571CXgTnYMlHgL0oJq0AEQZP/kZY/yZjUgQpW3iPxzqiq2R13Wxex7tYsPCCTJFhMGCzxFNqAAlpbk1euowSHroLLRlP/MP,iv:3TbpDjt3Ku01i5dDKcuxFLz5+BD1nVgIbo2MhpsWzeA=,tag:rMkY8bWe9I5lW19fgCOT3Q==,type:str] -sshconfigheaven: ENC[AES256_GCM,data:avOWd3yfj+5W8wd6YF6GgnkTvCHL3JHSMvDSVrJSopkRxrZjr+t1F38UCrwOjwJR5WjjK2sRhjb5y/+oWVekDMgSHgvNz7qVvwDqemc9aCSGx9AaNrwI9etdlxxSnpIjNwuv3JJ/ey1tRd0NtRCn0ZED9Q==,iv:DwKL2SXK4THkauzaM92p042O7AoBkX7O80Sg3xvqjCc=,tag:m6YvIGFaZ5iTlJvFEwQmyA==,type:str] -gk: ENC[AES256_GCM,data:cDNhKne49s23V/ew0BqSmR6G0yGcKWHLljZreKbgGqkuhuHzTyVK//Ac0N4mAY8iT91TKXVAeEkXnyKCo+aCAasABm0+zWGf5KOHInYuay8fSXbMeZdu1Me+IjAWnKeNrR3A7Ji+oFGMuHVzOBSt29Iz5NwwRdDbrTprtjPWzNMu+pg6d8n1+bxqaUoKkFzoR7QDjOUkJQfzeEsMplm84rTSXVDri2p2OqvtD9ZcvmzBeQtc0BCYhsLBkq98o7bxdqAHBoFiri+EVusYynAQ/GuMY8vGlP9hCXzJhg9zMUSuLhk8Vs4mgkfKzfllsr+FeVA/AOU041yCt2tbjRZQT3arqWNFy07uvB+mues4c5kX88wZMxA1E0/r7aktdhTVAgVCLxAr5w643LHRbnGkqzYabqCkpxC2A9IR4nMBVDchIdGjLw2NlTE9Y0c26fZkver6H9r+d1WXdNVaekF0jTzTOOziEftVI8ocNBY3HKiXK1jUZV1rre3OBn3T/eT+zEkTaB83z4Ytmpps6U8U,iv:YXS2maDUgxVZI8BhJjJ4MuvnyDKVMGEtmnkiLw61NB8=,tag:A/8xH24bXbDsndM9LbG+Ig==,type:str] -oxk: ENC[AES256_GCM,data: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,iv:wvGN3wh+t3vhepc8FQRcuFnHWnde9Gw97YvGsTjge0c=,tag:ILrkx/cGPbhXjVLFkAnhcQ==,type:str] -glk: ENC[AES256_GCM,data:N/ius8Rd2q6BeaCGqaI9TIYEvSmYwqMroxnyWr4xYa+cZONhAGPS4qS9CMwy18JcwEJlUj38gW9e3/X1RbLnjAFGlN5KTsWYOsmn9Jqk+PsF6NHOvUyw+rUxYFPwX5C3ZVLKjP/OK+mX5R/JwxrgsMkn0CDs6GCe4GupB39DaJq4KXGfjQSqDT/ZCVBOKPeHhzg/0Izt3U5yw7vW51nBQKlgazo54WSxq+/AX0zSf3TufMm26UMQBRbsRWPkeUrh8bO9cjpFlYUx5svzSAIRYuZR2FTqlkPdVuNpFWjHoERyw0jMy5jt59i9pQNztZ7kBjxAcMbjW6FIMxGMJGRPJUuq87oWBmS0NowSfN+Khz/szbrkrClrTNM9kIIzugB0KtagEO3wKcAkHBUs85OQep6H3hkCp1gBk8g0UPfuUdgncr41vliJDqgMhaNc+DVGOnMPnxYyyEDkyySpC+ApkgrwMBQVarNWWw8v/r4ADWQiaMZJv3Uk0x7uNa62Cn9vohHA8rmYsyACAW1xFnwH,iv:Dr9SRsZ5I9nOCJFMHp+EIJ4w0I9gqHo7KBbPruo2thw=,tag:SvwkXGWGQZChauXYaKUZQw==,type:str] -silicon: ENC[AES256_GCM,data:7gyAj0rfRtggcwveC82UGaj0ZfKymKmf+fhErjFGaIlxyeOG2jgIHpa2ckb2GDiXMLjUAMBiFOISzXut8aERg30DZnAKam7XnuRK3Ue6w9e9Wzb7sSAAI1iFINNFDf2fGdTEpObyXejvjHUcLk2hY/BusCCiqW3dIuSxFtIaIOcuaRAMI/7UkhhyWihwJaP3ZiovFHpBds3d2538ahJy9cUHnShwDcTi/cXph2DNjFTTZE8mlGTrNQ0wRoXgi0o9GNwHcDi+CgFg0WoR5yma00BuFtEN0ymt6vES0mrtuZBhn52HXO32oFKajqssyQe4e9gxREUw89W64xMiYBmBInP9Fq+9uT/7yxhrKP3BaFZi9AVNJtHVu/UkwxOxwUCvt18IvSkRgOH+ayH+qCUOZxtuPcfrjiGk7QEgNfNvegKzlNjaeKeew4pA8Yz2tm4QWgpm0+SilSwuzF8wxHcHspYdBtMzNEHg1dyC7uuwygkMkRcR9f1XCUR1tiB+rBeXoOKoIynD819wkhvJSKGR1+aBgjnJF09wd1tVus3yk3FYqzPevHlxH4M79Cs1QXAlVhligL3uvEfYQ+TM,iv:JXivO8dSxrIhezChQhYrsexJg0dwc68Nn2jOwiQhADk=,tag:iZiwrQDoB5ABZ0iziVwTQg==,type:str] -heaven: ENC[AES256_GCM,data:vkp1rptFv7FHo8Rgk1TXS8GgYzgxlmWqB5xvFSjZB3gm3XFVqLei2WsxYsE/pKWb0l3Xqu98uE5bnRvsNcWzLRCmlF/ByVtcXZrovD4kHXrsq0MhBPLRvKAfAOnCsmw/6/rCy1IlRWuH2OHMhgG4Mv47nf0mMcgM+2mr3kVvxKf6dNyK0eQ9D+pOjr/jZrkaHZJZ0UA2iMIl16BWQSLVRQhbOSDzYGfYr/LfXWHsJPhy3TiSK+jHC2JUpD3pYy1Hf9u/fTDmrwOkshZGdMUzIatVHZpcxF/ZV/S8YxGSeJhnmoZ3sgdZ7gKDhpsntOKZGQ5SP/sZobjqhGjSkN+7m4aX9MCnlPx0H/YB5iGG9mNTbkmpGKXm2btWFCtkkzycSHwoQaPD+c4zmBo2AmeeS1ullVJZl/vgocqN0EFkmDzCRTpUIyUwXBhGu2wjPFRmUrqbs0PoD8mq+U3jbROkg+pct/sx6vUnG0oWqGN+LIaWcPl7CrlgWbArysBtYxq8fHhVrav2KalBa5VULtZM,iv:1sjPiHi1eXtrrwwS6sXQIz+0Bc21E3d+H4Gu4WC4yfY=,tag:8GaFXWM46EYlp9vljnaGqA==,type:str] -gts: ENC[AES256_GCM,data:1A3ibn9TdIh5oQjHpcSTg2GBSA5QsVVreXIAFAspNILbe/Rpo3XPIqa26GRqLLjywzeAIfu926N17kxL+bmRHHU23ltceG0f2h+rF6iaWjjv2PvfHEAZbNDcR7yDdmODCXRpIIArorXi76hmX0mFX7DI5Gc9ytD930gKeIp1dhs7tTCddwAJTBra9oC4ga0YDEHzzAtfT35s0hRC4u7LJdvBElaVKJFkxCqx62y6zB1OgCcv8oSDibvC+71LA0/krdVnwbK77TIm23LiaCoXP5IizjR7h5VWf0gmepW/ED4xaRHxDUqhfUAumIeSW+kvp2TDZ4T/qvIwgafMyxZ9jZozBy1VI50IMkJl9KeZJZaB3FHE3x7UxwBzvO8E7svK+33fUU/o7TX4Qtq2UUPNG2aGjyfR956ezrWGMz5+Tl6wtATBuKckUSxmLorKjL/soTk/SA2uSFI09CPJ0Rg0D3LeMh5IgzEVgt8KPoR+yQUNmt1z7D9zurnonJ6EvYJKatOv9okwt52EmuhaTcre,iv:1ZBT7UQty8oC5bxbzdkkgbi6zEPzd9fBy8kY5MJukmg=,tag:zOWkS3BIN7DnniWSGywxdQ==,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-06-11T19:59:09Z" - mac: ENC[AES256_GCM,data:NOZLZ/Rlwej869kysJn20aDRAws5x+tr0XAXtac8duOQT7VC0Tox5sZS98J/C/x/oNJmlGVsG5H7pNbTPe5idK+aEm9ndoACVpQg/ZtUAQk9jowVh92/miAg7QisSjXlxU+HISADtiuVevJiV5nml1w6br4qlYcr6qqCwNihaUU=,iv:6wnlB6wP/b2ZDRE6g2dk41shFp5GfH159/M+Z8t0sK8=,tag:mrsS7VWoaeLN1CZ+eAbIiQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/variables.nix b/variables.nix deleted file mode 100644 index e6af3ac..0000000 --- a/variables.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - hostName = "nixy"; - username = "hadi"; - homeDirectory = "/home/hadi"; - - 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"; - }; - - stateVersion = "24.05"; - enableAutoUpgrade = false; - enableAutoGarbageCollector = false; - enableSops = true; - enableNextcloud = true; - enableNvidia = true; - enablePrime = true; - - server = { - hostName = "heaven"; - stateVersion = "24.05"; - enableAutoUpgrade = false; - enableAutoGarbageCollector = false; - }; -}