diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 4f74910..70047ec 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -28,7 +28,8 @@ home-manager = { users = { "k" = import ./home.nix; }; }; environment.systemPackages = with pkgs; [ microcodeIntel ]; - hardware.opengl = { + + hardware.graphics = { enable = true; extraPackages = with pkgs; [ intel-compute-runtime diff --git a/hosts/server/home.nix b/hosts/server/home.nix index 03c6ee2..3bb68d6 100644 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -1,43 +1,11 @@ { config, pkgs, inputs, ... }: { - nixpkgs.config.allowUnfree = true; - + imports = [ ../home/home_common.nix ]; home = { - username = "k"; - homeDirectory = "/home/k"; - stateVersion = "23.11"; - enableNixpkgsReleaseCheck = false; - - packages = [ pkgs.neovim pkgs.btop ]; + packages = with pkgs; [ + docker + docker-compose + ]; }; - - programs = { - git = { - enable = true; - userName = "k"; - userEmail = "markers711@gmail.com"; - }; - - starship.enable = true; - zsh = { - enable = true; - autosuggestion.enable = true; - enableCompletion = true; - syntaxHighlighting.enable = true; - autocd = true; - plugins = [{ - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.8.0"; - sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; - }; - }]; - }; - }; - - services.syncthing.enable = true; } diff --git a/hosts/server/service.nix b/hosts/server/service.nix index fc76285..030334e 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -61,16 +61,6 @@ }; }; - ntfy-sh = { - enable = true; - settings = { - listen-http = ":8004"; - auth-file = "/var/lib/ntfy.db"; - auth-default-access = "read-only"; - base-url = "https://ntfy.dhilton.xyz"; - }; - }; - searx = { enable = true; settings = { @@ -101,15 +91,6 @@ }; }; - "ntfy.dhilton.xyz" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8004"; - proxyWebsockets = true; - }; - }; - "jel.dhilton.xyz" = { forceSSL = true; enableACME = true; @@ -119,15 +100,6 @@ }; }; - "puf.dhilton.xyz" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8002"; - proxyWebsockets = true; - }; - }; - "srx.dhilton.xyz" = { forceSSL = true; enableACME = true;