diff --git a/configuration.nix b/configuration.nix index eae3e8d..8a265ab 100644 --- a/configuration.nix +++ b/configuration.nix @@ -105,6 +105,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.sondell = { + home = "/home/sondell"; isNormalUser = true; description = "sondell"; extraGroups = ["networkmanager" "wheel"]; @@ -127,6 +128,7 @@ 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 + restic htop cloudflared filebrowser @@ -143,17 +145,19 @@ programs = { ssh.startAgent = true; fish = { - enable = true; + enable = false; shellInit = "starship init fish | source"; }; - starship.enable = true; - starship.settings = { - shell = { - disabled = false; - fish_indicator = ""; - bash_indicator = "BASH"; + starship = { + enable = false; + settings = { + shell = { + disabled = false; + # fish_indicator = ""; + bash_indicator = "BASH"; + }; }; - }; + }; }; # Some programs need SUID wrappers, can be configured further or are diff --git a/flake.lock b/flake.lock index f632184..5f629a9 100644 --- a/flake.lock +++ b/flake.lock @@ -71,6 +71,26 @@ "url": "https://git.sondell.org/glennwso/home.git" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716847642, + "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixos-mailserver": { "inputs": { "blobs": "blobs", @@ -78,14 +98,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1710449465, - "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", + "lastModified": 1718697807, + "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", + "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", "type": "gitlab" }, "original": { @@ -96,11 +116,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -110,9 +130,25 @@ "type": "github" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "root": { "inputs": { "home": "home", + "home-manager": "home-manager", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs" } @@ -131,39 +167,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3d37b82..afb2517 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,11 @@ mailserver = nixos-mailserver.nixosModules.default; homeSettings = { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.sondell = import ./home/sondell.nix; - }; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.sondell = import ./home/sondell.nix; + }; }; homeModules = [ home-manager.nixosModules.home-manager @@ -46,7 +46,7 @@ ./forgejo.nix ./nextcloud.nix ./jellyfin.nix - ./filebrowser.nix + # ./filebrowser.nix ./tail.nix ./matrix.nix ./coturn.nix diff --git a/nextcloud.nix b/nextcloud.nix index 925b336..64ffef8 100644 --- a/nextcloud.nix +++ b/nextcloud.nix @@ -31,11 +31,16 @@ in services = { - # restic = { - # "nextcloud-repo" = { - # passwordFile = "/etc/nixos/.secrets/restic_pw"; - # }; - # }; + restic.backups = { + "diskstation423" = { + passwordFile = "/etc/nixos/.secrets/restic_pw"; + repository = "sftp:Glenn@nas:/home/back/nextcloud/restic-repo"; + paths = [ + "/pool/var/lib/nextcloud" + ]; + timerConfig.onCalendar = "02:05"; + }; + }; nginx.virtualHosts = {