-99

nixos/configuration.nix

reviewed

··· 1 1 - # This is your system's configuration file. 2 2 - # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) 3 3 - 4 4 - { inputs, outputs, lib, config, pkgs, ... }: { 5 5 - # You can import other NixOS modules here 6 6 - imports = [ 7 7 - # If you want to use modules your own flake exports (from modules/nixos): 8 8 - # outputs.nixosModules.example 9 9 - 10 10 - # Or modules from other flakes (such as nixos-hardware): 11 11 - # inputs.hardware.nixosModules.common-cpu-amd 12 12 - # inputs.hardware.nixosModules.common-ssd 13 13 - 14 14 - # You can also split up your configuration and import pieces of it here: 15 15 - # ./users.nix 16 16 - 17 17 - # Import your generated (nixos-generate-config) hardware configuration 18 18 - ./hardware-configuration.nix 19 19 - ]; 20 20 - 21 21 - nixpkgs = { 22 22 - # You can add overlays here 23 23 - overlays = [ 24 24 - # If you want to use overlays your own flake exports (from overlays dir): 25 25 - # outputs.overlays.modifications 26 26 - # outputs.overlays.additions 27 27 - 28 28 - # Or overlays exported from other flakes: 29 29 - # neovim-nightly-overlay.overlays.default 30 30 - 31 31 - # Or define it inline, for example: 32 32 - # (final: prev: { 33 33 - # hi = final.hello.overrideAttrs (oldAttrs: { 34 34 - # patches = [ ./change-hello-to-hi.patch ]; 35 35 - # }); 36 36 - # }) 37 37 - ]; 38 38 - # Configure your nixpkgs instance 39 39 - config = { 40 40 - # Disable if you don't want unfree packages 41 41 - allowUnfree = true; 42 42 - }; 43 43 - }; 44 44 - 45 45 - nix = { 46 46 - # This will add each flake input as a registry 47 47 - # To make nix3 commands consistent with your flake 48 48 - registry = lib.mapAttrs (_: value: { flake = value; }) inputs; 49 49 - 50 50 - # This will additionally add your inputs to the system's legacy channels 51 51 - # Making legacy nix commands consistent as well, awesome! 52 52 - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; 53 53 - 54 54 - settings = { 55 55 - # Enable flakes and new 'nix' command 56 56 - experimental-features = "nix-command flakes"; 57 57 - # Deduplicate and optimize nix store 58 58 - auto-optimise-store = true; 59 59 - }; 60 60 - }; 61 61 - 62 62 - # FIXME: Add the rest of your current configuration 63 63 - 64 64 - # TODO: Set your hostname 65 65 - networking.hostName = "your-hostname"; 66 66 - 67 67 - # TODO: This is just an example, be sure to use whatever bootloader you prefer 68 68 - boot.loader.systemd-boot.enable = true; 69 69 - 70 70 - # TODO: Configure your system-wide user settings (groups, etc), add more users as needed. 71 71 - users.users = { 72 72 - # FIXME: Replace with your username 73 73 - your-username = { 74 74 - # TODO: You can set an initial password for your user. 75 75 - # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install. 76 76 - # Be sure to change it (using passwd) after rebooting! 77 77 - initialPassword = "correcthorsebatterystaple"; 78 78 - isNormalUser = true; 79 79 - openssh.authorizedKeys.keys = [ 80 80 - # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect 81 81 - ]; 82 82 - # TODO: Be sure to add any other groups you need (such as networkmanager, audio, docker, etc) 83 83 - extraGroups = [ "wheel" ]; 84 84 - }; 85 85 - }; 86 86 - 87 87 - # This setups a SSH server. Very important if you're setting up a headless system. 88 88 - # Feel free to remove if you don't need it. 89 89 - services.openssh = { 90 90 - enable = true; 91 91 - # Forbid root login through SSH. 92 92 - permitRootLogin = "no"; 93 93 - # Use keys only. Remove if you want to SSH using password (not recommended) 94 94 - passwordAuthentication = false; 95 95 - }; 96 96 - 97 97 - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion 98 98 - system.stateVersion = "22.11"; 99 99 - }

-10

nixos/hardware-configuration.nix

reviewed

··· 1 1 - # This is just an example, you should generate yours with nixos-generate-config and put it in here. 2 2 - { 3 3 - fileSystems."/" = { 4 4 - device = "/dev/sda1"; 5 5 - fsType = "ext4"; 6 6 - }; 7 7 - 8 8 - # Set your system kind (needed for flakes) 9 9 - nixpkgs.hostPlatform = "x86_64-linux"; 10 10 - }

-31

pkgs/wallabag.patch

reviewed

··· 1 1 - diff --git a/app/AppKernel.php b/app/AppKernel.php 2 2 - index 347197e..902b558 100644 3 3 - --- a/app/AppKernel.php 4 4 - +++ b/app/AppKernel.php 5 5 - @@ -69,19 +69,24 @@ class AppKernel extends Kernel 6 6 - return __DIR__; 7 7 - } 8 8 - 9 9 - + public function getProjectDir() 10 10 - + { 11 11 - + return getenv('WALLABAG_DATA') ?: dirname(__DIR__); 12 12 - + } 13 13 - + 14 14 - public function getCacheDir() 15 15 - { 16 16 - - return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); 17 17 - + return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment(); 18 18 - } 19 19 - 20 20 - public function getLogDir() 21 21 - { 22 22 - - return dirname(__DIR__) . '/var/logs'; 23 23 - + return $this->getProjectDir() . '/var/logs'; 24 24 - } 25 25 - 26 26 - public function registerContainerConfiguration(LoaderInterface $loader) 27 27 - { 28 28 - - $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); 29 29 - + $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); 30 30 - 31 31 - $loader->load(function ($container) {