Merge branch 'main' of https://github.com/Lillian-Violet/NixOS-Configuration
This commit is contained in:
		
						commit
						742ded6cc7
					
				
					 5 changed files with 25 additions and 23 deletions
				
			
		
							
								
								
									
										24
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										24
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -7,11 +7,11 @@
 | 
			
		|||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1702814335,
 | 
			
		||||
        "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=",
 | 
			
		||||
        "lastModified": 1703026685,
 | 
			
		||||
        "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "home-manager",
 | 
			
		||||
        "rev": "e4dba0bd01956170667458be7b45f68170a63651",
 | 
			
		||||
        "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -23,11 +23,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1702312524,
 | 
			
		||||
        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
 | 
			
		||||
        "lastModified": 1702830618,
 | 
			
		||||
        "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
 | 
			
		||||
        "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -55,11 +55,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs-unstable": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1702312524,
 | 
			
		||||
        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
 | 
			
		||||
        "lastModified": 1702830618,
 | 
			
		||||
        "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
 | 
			
		||||
        "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -99,11 +99,11 @@
 | 
			
		|||
        "nixpkgs-stable": "nixpkgs-stable"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1702812162,
 | 
			
		||||
        "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=",
 | 
			
		||||
        "lastModified": 1702937567,
 | 
			
		||||
        "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=",
 | 
			
		||||
        "owner": "Mic92",
 | 
			
		||||
        "repo": "sops-nix",
 | 
			
		||||
        "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77",
 | 
			
		||||
        "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -56,6 +56,7 @@
 | 
			
		|||
 | 
			
		||||
  home.packages = with pkgs; [
 | 
			
		||||
    # Coding:
 | 
			
		||||
    direnv
 | 
			
		||||
    git
 | 
			
		||||
    kate
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -95,7 +95,7 @@
 | 
			
		|||
    aria2
 | 
			
		||||
    git-filter-repo
 | 
			
		||||
    home-manager
 | 
			
		||||
    nextcloud27
 | 
			
		||||
    nextcloud28
 | 
			
		||||
    nginx
 | 
			
		||||
    noto-fonts
 | 
			
		||||
    noto-fonts-emoji-blob-bin
 | 
			
		||||
| 
						 | 
				
			
			@ -150,7 +150,7 @@
 | 
			
		|||
    defaults.email = "letsencrypt@gladtherescake.eu";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  users.groups.virtualMail = {};
 | 
			
		||||
  # users.groups.virtualMail = {};
 | 
			
		||||
 | 
			
		||||
  users.users = {
 | 
			
		||||
    lillian = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,13 +20,13 @@
 | 
			
		|||
  sops.secrets."mailpass".mode = "0440";
 | 
			
		||||
  sops.secrets."mailpass".owner = config.users.users.virtualMail.name;
 | 
			
		||||
 | 
			
		||||
  users.users = {
 | 
			
		||||
    virtualMail = {
 | 
			
		||||
      isSystemUser = true;
 | 
			
		||||
      isNormalUser = false;
 | 
			
		||||
      group = "virtualMail";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  # users.users = {
 | 
			
		||||
  #   virtualMail = {
 | 
			
		||||
  #     isSystemUser = true;
 | 
			
		||||
  #     isNormalUser = false;
 | 
			
		||||
  #     group = "virtualMail";
 | 
			
		||||
  #   };
 | 
			
		||||
  # };
 | 
			
		||||
 | 
			
		||||
  mailserver = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@
 | 
			
		|||
    enable = true;
 | 
			
		||||
    hostName = "nextcloud.gladtherescake.eu";
 | 
			
		||||
 | 
			
		||||
    package = pkgs.nextcloud27;
 | 
			
		||||
    package = pkgs.nextcloud28;
 | 
			
		||||
 | 
			
		||||
    # Use HTTPS for links
 | 
			
		||||
    https = true;
 | 
			
		||||
| 
						 | 
				
			
			@ -74,7 +74,8 @@
 | 
			
		|||
      };
 | 
			
		||||
      # List of apps we want to install and are already packaged in
 | 
			
		||||
      # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json
 | 
			
		||||
      inherit calendar contacts deck forms music notes onlyoffice polls twofactor_nextcloud_notification unsplash;
 | 
			
		||||
      #inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash;
 | 
			
		||||
      #inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash;
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    config = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue