diff --git a/configuration.nix b/configuration.nix index e127d9b..480e604 100644 --- a/configuration.nix +++ b/configuration.nix @@ -130,7 +130,6 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget - alejandra restic htop cloudflared diff --git a/home/sondell.nix b/home/sondell.nix index 7eb232e..e35b39d 100644 --- a/home/sondell.nix +++ b/home/sondell.nix @@ -9,56 +9,12 @@ # paths it should manage. home.username = "sondell"; home.homeDirectory = "/home/sondell"; -programs = { - ssh.addKeysToAgent = "yes"; - ssh.enable = true; - ssh.matchBlocks."*".identityFile = [ + programs.ssh.addKeysToAgent = "yes"; + programs.ssh.enable = true; + programs.ssh.matchBlocks."*".identityFile = [ "/home/sondell/.ssh/tulpan" ]; - # Let Home Manager install and manage itself. - home-manager.enable = true; - - helix = { - enable = true; - defaultEditor = true; - languages = { - language = [ - { - name = "nix"; - auto-format = true; - formatter = {command = "alejandra";}; - } - { - name = "python"; - auto-format = true; - formatter = { - command = "black"; - args = ["-q" "--fast" "-"]; - }; - } - ]; - }; - settings = { - # theme = "nightfox"; - keys.normal = { - C-up = "expand_selection"; - C-down = "shrink_selection"; - C-left = "select_prev_sibling"; - C-right = "select_next_sibling"; - }; - editor = { - cursor-shape = { - insert = "bar"; - }; - line-number = "relative"; - }; - }; - }; - - -}; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards @@ -68,4 +24,7 @@ programs = { # the Home Manager release notes for a list of state version # changes in each release. home.stateVersion = "24.05"; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; } diff --git a/vaultwarden.nix b/vaultwarden.nix index 99b9ba9..104f1f7 100644 --- a/vaultwarden.nix +++ b/vaultwarden.nix @@ -11,24 +11,6 @@ in }; - services.restic.backups = { - "vaultwarden" = { - passwordFile = "/etc/nixos/.secrets/restic_pw"; - repository = "sftp:Glenn@nas:/home/back/vaultwarden/restic"; - initialize = true; - paths = [ - "/var/lib/bitwarden_rs" - ]; - user = "sondell"; - timerConfig.OnCalendar = "02:05"; - pruneOpts = [ - "--keep-daily 10" - "--keep-weekly 5" - "--keep-monthly 12" - "--keep-yearly 75" - ]; - }; - }; services.nginx.virtualHosts.${domain} = { forceSSL = true; enableACME = true;