Merge branch 'main' of https://github.com/Lillian-Violet/NixOS-Configuration
This commit is contained in:
		
						commit
						6c5149ab9b
					
				
					 6 changed files with 35 additions and 26 deletions
				
			
		
							
								
								
									
										36
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										36
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -7,11 +7,11 @@
 | 
			
		|||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1700900274,
 | 
			
		||||
        "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=",
 | 
			
		||||
        "lastModified": 1701728041,
 | 
			
		||||
        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "home-manager",
 | 
			
		||||
        "rev": "a462e7315deaa8194b0821f726709bb7e51a850c",
 | 
			
		||||
        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -23,11 +23,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1700794826,
 | 
			
		||||
        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
 | 
			
		||||
        "lastModified": 1701436327,
 | 
			
		||||
        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
 | 
			
		||||
        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -39,11 +39,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs-stable": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1700905716,
 | 
			
		||||
        "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=",
 | 
			
		||||
        "lastModified": 1701568804,
 | 
			
		||||
        "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "dfb95385d21475da10b63da74ae96d89ab352431",
 | 
			
		||||
        "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -55,11 +55,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs-unstable": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1700794826,
 | 
			
		||||
        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
 | 
			
		||||
        "lastModified": 1701436327,
 | 
			
		||||
        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
 | 
			
		||||
        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -71,11 +71,11 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs_2": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1700856099,
 | 
			
		||||
        "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
 | 
			
		||||
        "lastModified": 1701336116,
 | 
			
		||||
        "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
 | 
			
		||||
        "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			@ -99,11 +99,11 @@
 | 
			
		|||
        "nixpkgs-stable": "nixpkgs-stable"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1700967639,
 | 
			
		||||
        "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=",
 | 
			
		||||
        "lastModified": 1701728052,
 | 
			
		||||
        "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=",
 | 
			
		||||
        "owner": "Mic92",
 | 
			
		||||
        "repo": "sops-nix",
 | 
			
		||||
        "rev": "4be58d802693d7def8622ff34d36714f8db40371",
 | 
			
		||||
        "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,6 +42,10 @@
 | 
			
		|||
      allowUnfree = true;
 | 
			
		||||
      # Workaround for https://github.com/nix-community/home-manager/issues/2942
 | 
			
		||||
      allowUnfreePredicate = _: true;
 | 
			
		||||
 | 
			
		||||
      permittedInsecurePackages = [
 | 
			
		||||
        "electron-24.8.6"
 | 
			
		||||
      ];
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -62,7 +66,7 @@
 | 
			
		|||
    # Chat applications:
 | 
			
		||||
    element-desktop
 | 
			
		||||
    signal-desktop
 | 
			
		||||
    webcord
 | 
			
		||||
    webcord-vencord
 | 
			
		||||
 | 
			
		||||
    # Gaming:
 | 
			
		||||
    prismlauncher
 | 
			
		||||
| 
						 | 
				
			
			@ -103,7 +107,7 @@
 | 
			
		|||
    package = pkgs.vscodium;
 | 
			
		||||
    extensions = with pkgs.vscode-extensions; [
 | 
			
		||||
      arrterian.nix-env-selector
 | 
			
		||||
      ban.spellright
 | 
			
		||||
      #ban.spellright
 | 
			
		||||
      dracula-theme.theme-dracula
 | 
			
		||||
      eamodio.gitlens
 | 
			
		||||
      github.vscode-pull-request-github
 | 
			
		||||
| 
						 | 
				
			
			@ -113,7 +117,7 @@
 | 
			
		|||
      ms-pyright.pyright
 | 
			
		||||
      #ms-python.python
 | 
			
		||||
      ms-python.vscode-pylance
 | 
			
		||||
      ms-vscode-remote.remote-containers
 | 
			
		||||
      #ms-vscode-remote.remote-containers
 | 
			
		||||
      ms-vscode-remote.remote-ssh
 | 
			
		||||
      oderwat.indent-rainbow
 | 
			
		||||
      rust-lang.rust-analyzer
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@
 | 
			
		|||
    enableCompletion = true;
 | 
			
		||||
    historySubstringSearch.enable = true;
 | 
			
		||||
    syntaxHighlighting.enable = true;
 | 
			
		||||
    zsh-abbr.enable = true;
 | 
			
		||||
    #zsh-abbr.enable = true;
 | 
			
		||||
    oh-my-zsh = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      plugins = [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,7 @@
 | 
			
		|||
    nginx = {
 | 
			
		||||
      enableACME = true;
 | 
			
		||||
      forceSSL = true;
 | 
			
		||||
      serverName = "social.gladtherescake.eu";
 | 
			
		||||
      serverName = "akkoma.gladtherescake.eu";
 | 
			
		||||
    };
 | 
			
		||||
    #dist.cookie._secret = config.sops.secrets."releaseCookie".path;
 | 
			
		||||
    config = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
    ./nextcloud.nix
 | 
			
		||||
    ./mail-server.nix
 | 
			
		||||
    ./gotosocial.nix
 | 
			
		||||
    #./akkoma.nix
 | 
			
		||||
    ./akkoma.nix
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  boot.tmp.cleanOnBoot = true;
 | 
			
		||||
| 
						 | 
				
			
			@ -113,7 +113,9 @@
 | 
			
		|||
  # Enable networking
 | 
			
		||||
  networking.networkmanager.enable = true;
 | 
			
		||||
 | 
			
		||||
  networking.firewall.allowedTCPPorts = [80 443 1443];
 | 
			
		||||
  networking.firewall.enable = true;
 | 
			
		||||
 | 
			
		||||
  networking.firewall.allowedTCPPorts = [22 80 443 1433];
 | 
			
		||||
 | 
			
		||||
  # Set your time zone.
 | 
			
		||||
  time.timeZone = "Europe/Amsterdam";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -62,12 +62,14 @@
 | 
			
		|||
    docker-compose
 | 
			
		||||
    git-filter-repo
 | 
			
		||||
    home-manager
 | 
			
		||||
    input-leap
 | 
			
		||||
    krunner-translator
 | 
			
		||||
    libsForQt5.discover
 | 
			
		||||
    libsForQt5.kcalc
 | 
			
		||||
    libsForQt5.kdepim-addons
 | 
			
		||||
    libsForQt5.kirigami2
 | 
			
		||||
    libsForQt5.kdeconnect-kde
 | 
			
		||||
    libsForQt5.krunner-ssh
 | 
			
		||||
    libsForQt5.krunner-symbols
 | 
			
		||||
    libsForQt5.packagekit-qt
 | 
			
		||||
    libportal-qt5
 | 
			
		||||
    noto-fonts
 | 
			
		||||
| 
						 | 
				
			
			@ -78,6 +80,7 @@
 | 
			
		|||
    pciutils
 | 
			
		||||
    rsync
 | 
			
		||||
    steam
 | 
			
		||||
    sqlfluff
 | 
			
		||||
    wget
 | 
			
		||||
    zsh
 | 
			
		||||
  ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue