From 21dc4a1249e84833cf6b4c37aca67cdbd7524ae5 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Wed, 7 Dec 2022 18:07:40 +1000 Subject: [PATCH] more cruft --- nixos/configuration.nix | 99 -------------------------------- nixos/hardware-configuration.nix | 10 ---- pkgs/wallabag.patch | 31 ---------- 3 files changed, 140 deletions(-) delete mode 100644 nixos/configuration.nix delete mode 100644 nixos/hardware-configuration.nix delete mode 100644 pkgs/wallabag.patch diff --git a/nixos/configuration.nix b/nixos/configuration.nix deleted file mode 100644 index f73db0e5..00000000 --- a/nixos/configuration.nix +++ /dev/null @@ -1,99 +0,0 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) - -{ inputs, outputs, lib, config, pkgs, ... }: { - # You can import other NixOS modules here - imports = [ - # If you want to use modules your own flake exports (from modules/nixos): - # outputs.nixosModules.example - - # Or modules from other flakes (such as nixos-hardware): - # inputs.hardware.nixosModules.common-cpu-amd - # inputs.hardware.nixosModules.common-ssd - - # You can also split up your configuration and import pieces of it here: - # ./users.nix - - # Import your generated (nixos-generate-config) hardware configuration - ./hardware-configuration.nix - ]; - - nixpkgs = { - # You can add overlays here - overlays = [ - # If you want to use overlays your own flake exports (from overlays dir): - # outputs.overlays.modifications - # outputs.overlays.additions - - # Or overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; - - nix = { - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: { flake = value; }) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - # FIXME: Add the rest of your current configuration - - # TODO: Set your hostname - networking.hostName = "your-hostname"; - - # TODO: This is just an example, be sure to use whatever bootloader you prefer - boot.loader.systemd-boot.enable = true; - - # TODO: Configure your system-wide user settings (groups, etc), add more users as needed. - users.users = { - # FIXME: Replace with your username - your-username = { - # TODO: You can set an initial password for your user. - # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install. - # Be sure to change it (using passwd) after rebooting! - initialPassword = "correcthorsebatterystaple"; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect - ]; - # TODO: Be sure to add any other groups you need (such as networkmanager, audio, docker, etc) - extraGroups = [ "wheel" ]; - }; - }; - - # This setups a SSH server. Very important if you're setting up a headless system. - # Feel free to remove if you don't need it. - services.openssh = { - enable = true; - # Forbid root login through SSH. - permitRootLogin = "no"; - # Use keys only. Remove if you want to SSH using password (not recommended) - passwordAuthentication = false; - }; - - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "22.11"; -} diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix deleted file mode 100644 index dd009398..00000000 --- a/nixos/hardware-configuration.nix +++ /dev/null @@ -1,10 +0,0 @@ -# This is just an example, you should generate yours with nixos-generate-config and put it in here. -{ - fileSystems."/" = { - device = "/dev/sda1"; - fsType = "ext4"; - }; - - # Set your system kind (needed for flakes) - nixpkgs.hostPlatform = "x86_64-linux"; -} diff --git a/pkgs/wallabag.patch b/pkgs/wallabag.patch deleted file mode 100644 index 243569b4..00000000 --- a/pkgs/wallabag.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/app/AppKernel.php b/app/AppKernel.php -index 347197e..902b558 100644 ---- a/app/AppKernel.php -+++ b/app/AppKernel.php -@@ -69,19 +69,24 @@ class AppKernel extends Kernel - return __DIR__; - } - -+ public function getProjectDir() -+ { -+ return getenv('WALLABAG_DATA') ?: dirname(__DIR__); -+ } -+ - public function getCacheDir() - { -- return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment(); -+ return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment(); - } - - public function getLogDir() - { -- return dirname(__DIR__) . '/var/logs'; -+ return $this->getProjectDir() . '/var/logs'; - } - - public function registerContainerConfiguration(LoaderInterface $loader) - { -- $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); -+ $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); - - $loader->load(function ($container) {