diff --git a/hosts/homeserver/configuration.nix b/hosts/homeserver/configuration.nix index 9f87de2..6e24113 100644 --- a/hosts/homeserver/configuration.nix +++ b/hosts/homeserver/configuration.nix @@ -1,5 +1,4 @@ { - config, pkgs, inputs, ... @@ -94,7 +93,7 @@ "docker" "env-secrets" ]; - packages = with pkgs; [ ]; + packages = [ ]; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYGHT/TFeBEMKwalsqsnoAEdI/zrulCMMIQVshV3UiqbzxwmJbQPWxnx6mSKMGx0mK2fpo3WYuFwSVpznau7PraFKQvhPynTIiDsX3m57SHwtlf2g7U+hjLrGPgjHfKOAo7biRfAs762TM5/9sb1XCm+CBC9QZDsJn6usa8gwvKV43PPcINC7UE3MFiW7gYdXd6+bGTP75ue7KyewJ8fPz37+uIbKnJKA9oqj7/eTiJKIgtV9gkvmciTtsUlJtLG8WrvQ5UU2F/Nfnh4urbyM8C6vScRWM56d5qGqBFCoNDdeJHaFFp9vVy71BdAyP+CvqpkH++OtvewHs7IrCVZN15xkfQFuhMaSkrcPjencvZYt68Gun5BXhWN3Xp4HIXoFVO0U1k7oqGs7g6FBAW4CDt84I50zvw0xXoR5R5NeUA69rybh/bsNKipmO6G0j8vKfHSPnrjttH0h5K7cPXY0KR+C5Wa9lMtjx3ZAbWk/Ytsz3iJ+Eaho3kI7C9LYb03QtQsLrcEM6lIUcYjEQeGoAzByjJRLlCiqWMbQwexRfhacytOVWWuPcGGWckoiZKRmLsxZfuH967fRBH54DiF6Fx8GRfFclHOtxcbADB0muiw3A8jZAiUYZlvqwatpxK7neQ7VIJqqjkUZE2iK6byyyh1kOxl2PsHqpXNVSzELAxQ== tobinio@fedora" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjlpLDTc87fy6MYO96ugsswgkM4YeKj/21CwoOseMwE tobias.frischmann@proton.me" diff --git a/hosts/homeserver/hardware-configuration.nix b/hosts/homeserver/hardware-configuration.nix index 96c9b06..969868f 100644 --- a/hosts/homeserver/hardware-configuration.nix +++ b/hosts/homeserver/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: diff --git a/hosts/homeserver/services/postgres.nix b/hosts/homeserver/services/postgres.nix index 9d90a93..ee54acd 100644 --- a/hosts/homeserver/services/postgres.nix +++ b/hosts/homeserver/services/postgres.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { systemd.services.postgresql = { after = [ "docker.service" ]; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 139fb60..3e5980c 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -123,9 +123,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - rustdesk-flutter - ]; + environment.systemPackages = [ ]; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix index 667ffd4..8a9d722 100644 --- a/hosts/pc/configuration.nix +++ b/hosts/pc/configuration.nix @@ -113,7 +113,6 @@ # $ nix search wget environment.systemPackages = with pkgs; [ pika-backup - rustdesk-flutter blockbench vscode ]; diff --git a/shared/cli.nix b/shared/cli.nix index 93d4576..49298b0 100644 --- a/shared/cli.nix +++ b/shared/cli.nix @@ -16,11 +16,16 @@ starship zoxide + fastfetch ]; programs.fish = { enable = true; interactiveShellInit = '' + if test $COLUMNS -ge 120; and test $LINES -ge 30 + fastfetch -l nixos2 --logo-padding-right 6 --separator " " --structure "break:break:title:break:os:kernel:packages:disk:shell:terminal:wm:uptime:media:break:colors" + end + set fish_greeting # Disable greeting starship init fish | source diff --git a/shared/desktop.nix b/shared/desktop.nix index a449ae8..ef29443 100644 --- a/shared/desktop.nix +++ b/shared/desktop.nix @@ -7,6 +7,7 @@ { environment.systemPackages = with pkgs; [ inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default + chromium discord spotify diff --git a/shared/dev/apps.nix b/shared/dev/apps.nix index f7a66a2..b2bb35b 100644 --- a/shared/dev/apps.nix +++ b/shared/dev/apps.nix @@ -10,5 +10,7 @@ environment.systemPackages = with pkgs; [ zed-editor + + pgadmin4-desktopmode ]; } diff --git a/shared/dev/mod.nix b/shared/dev/mod.nix index d5b0e20..ceb9b74 100644 --- a/shared/dev/mod.nix +++ b/shared/dev/mod.nix @@ -15,6 +15,8 @@ nodejs pnpm + + docker-compose ]; programs.nix-ld.enable = true; @@ -28,4 +30,6 @@ enable = true; nix-direnv.enable = true; }; + + virtualisation.docker.enable = true; }