From aa5ea59fb4bac72b1800b3a0b2b972c0a63cdbe4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 10 May 2025 11:41:26 +0200 Subject: [PATCH] ljdsaljdsaljdsal --- flake.nix | 17 ++++++++++++++++- hosts/nixos/bjarte/configuration.nix | 3 ++- hosts/nixos/bolle/configuration.nix | 3 ++- hosts/nixos/garp/configuration.nix | 4 +++- hosts/nixos/nord/configuration.nix | 3 ++- hosts/nixos/sopp/configuration.nix | 3 ++- profiles/ccache.nix | 3 ++- profiles/desktop/gnome/default.nix | 1 + users/pbsds/default.nix | 7 +++---- 9 files changed, 33 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 13fe091..d12546c 100644 --- a/flake.nix +++ b/flake.nix @@ -347,13 +347,28 @@ inputs.sops-nix.homeManagerModules.sops inputs.nix-index-database.hmModules.nix-index ]; + nixpkgs.overlays = [ + self.overlays.pbsdspkgs + inputs.system-manager-edge.overlays.packages + (final: prev: { + unstable = import inputs.unstable { + inherit system; + config = final.pkgs.config; + }; + }) + ]; }]; extraSpecialArgs = { inherit inputs; }; }; in { - # TODO: pvv + # TODO: minimal + # TODO: static - fhs + # TODO: pvv - nfs home + # TODO: nix-portable - heid + # TODO: garmr + # TODO: furios? pbsds = mkHome "pbsds" "/home/pbsds" inputs-edge [ ./users/pbsds/home ]; pbsds-2411 = mkHome "pbsds" "/home/pbsds" inputs-2411 [ ./users/pbsds/home ]; pbsds-2405 = mkHome "pbsds" "/home/pbsds" inputs-2405 [ ./users/pbsds/home ]; diff --git a/hosts/nixos/bjarte/configuration.nix b/hosts/nixos/bjarte/configuration.nix index b0227fb..ef6f720 100644 --- a/hosts/nixos/bjarte/configuration.nix +++ b/hosts/nixos/bjarte/configuration.nix @@ -6,6 +6,7 @@ #boot.kernel.sysctl."vm.swappiness" = lib.mkDefault 10; # 0-100, commonly 60 zramSwap.enable = true; + zramSwap.memoryPercent = 30; # swapDevices = lib.mkForce []; # for testing only, not for building @@ -35,7 +36,7 @@ #../../../profiles/mounts/meconium-nfs.nix ../../../profiles/shell.nix - + # ../../../profiles/earlyoom # TODO ../../../profiles/desktop ../../../profiles/desktop/gnome # configures gdm diff --git a/hosts/nixos/bolle/configuration.nix b/hosts/nixos/bolle/configuration.nix index eb9675d..4265b25 100644 --- a/hosts/nixos/bolle/configuration.nix +++ b/hosts/nixos/bolle/configuration.nix @@ -31,7 +31,8 @@ networking.networkmanager.enable = true; # use memory more efficiently at the cost of some compute - zramSwap.enable = true; + # zramSwap.enable = true; + # zramSwap.memoryPercent = 20; # TODO: remove? Move? programs.dconf.enable = true; diff --git a/hosts/nixos/garp/configuration.nix b/hosts/nixos/garp/configuration.nix index 70e88e4..d949112 100644 --- a/hosts/nixos/garp/configuration.nix +++ b/hosts/nixos/garp/configuration.nix @@ -47,7 +47,9 @@ networking.networkmanager.enable = true; # use memory more efficiently at the cost of some compute - zramSwap.enable = true; + # zramSwap.enable = true; + # zramSwap.memoryPercent = 20; + # TODO: remove? Move? programs.dconf.enable = true; diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index f9ec918..9906128 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -7,7 +7,8 @@ # boot.kernel.sysctl."vm.swappiness" = lib.mkDefault 10; # 0-100, commonly 60 # swapDevices = lib.mkForce []; - zramSwap.enable = true; + # zramSwap.enable = true; + # zramSwap.memoryPercent = 20; # amdgpu audio fix when at 4k@60fps boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/hosts/nixos/sopp/configuration.nix b/hosts/nixos/sopp/configuration.nix index 7a12218..87b36c7 100644 --- a/hosts/nixos/sopp/configuration.nix +++ b/hosts/nixos/sopp/configuration.nix @@ -11,7 +11,8 @@ # boot.kernel.sysctl."vm.swappiness" = lib.mkDefault 10; # 0-100, commonly 60 # swapDevices = lib.mkForce []; - zramSwap.enable = true; + # zramSwap.enable = true; + # zramSwap.memoryPercent = 20; # for testing only, not for building boot.binfmt.addEmulatedSystemsToNixSandbox = false; diff --git a/profiles/ccache.nix b/profiles/ccache.nix index dd3bc7c..e79a5ec 100644 --- a/profiles/ccache.nix +++ b/profiles/ccache.nix @@ -5,7 +5,8 @@ ... }: -# TODO: sccache +# serge <3 +# TODO: distributed sccache (with redis) { programs.ccache.enable = true; diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix index 227accc..0356558 100644 --- a/profiles/desktop/gnome/default.nix +++ b/profiles/desktop/gnome/default.nix @@ -43,6 +43,7 @@ gnomeExtensions.appindicator decibels + dconf-editor loupe gnome-clocks diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index 8556613..6e08c0c 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -64,16 +64,15 @@ # TODO: fetch from github? openssh.authorizedKeys.keys = [ #"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAClYXCu7CyStjJ0AqZadUWfuA0h/3kC5FUJk4nTsR0nLXSNp26ETKYY9dID1JQCNgPDDZU3EKCNCpK+nZ/Q09L+agH5XtP6MRIDs0+aXZXy0rcLjS2fgx4ZgIiDGfBlaMCIrM/mdRzVmrYbeMotmkdsLSQ/lFBvX1IuzvUSnyYmRPCXxA== pederbs@hildring" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnVaayewel9GWGUYpTdLqfBnYnaBM10Vfq9fxeb9odwjf6pWe78il/5BCgW5EOadR/PeRv/ZYYnIT1uKEJOZkhjY2E6P2/B/JgzwPTwsrrjQsDHd5VjZty097dmf6vj0LXeJHmP9yogjPjGaSxktqyZi2CTFskRfZBPeCsoRMG+Z5bCMOHpXolvGCVWBNRcT3ITVYAAFL7HNPhcN3f5JkQgu0N+ySlMclNNSbHXXv1OIcLMKto6ZDx4DHp7NmU9uSbv8ERAfmoLCgdz1zOg0eVw9Kxs+XpUy3YFDdmPrny/Vq2LCDHljUWtjJI1uBoPF/ngavV+AuX5FHU9OSKNu7H pbsds@knut" + # "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnVaayewel9GWGUYpTdLqfBnYnaBM10Vfq9fxeb9odwjf6pWe78il/5BCgW5EOadR/PeRv/ZYYnIT1uKEJOZkhjY2E6P2/B/JgzwPTwsrrjQsDHd5VjZty097dmf6vj0LXeJHmP9yogjPjGaSxktqyZi2CTFskRfZBPeCsoRMG+Z5bCMOHpXolvGCVWBNRcT3ITVYAAFL7HNPhcN3f5JkQgu0N+ySlMclNNSbHXXv1OIcLMKto6ZDx4DHp7NmU9uSbv8ERAfmoLCgdz1zOg0eVw9Kxs+XpUy3YFDdmPrny/Vq2LCDHljUWtjJI1uBoPF/ngavV+AuX5FHU9OSKNu7H pbsds@knut" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+qv5MogWwOgctQfQeHxUHF2ij6UA8BR4DLXtZClnw6A1CtOjAtZeAW62C8q9OKaIKDO0hqd2vLBkgEno4smqBDJ2ThwKuXrhiHqJzCkXZqIKKx79mpTo7aRpFgkJ7328Ee+tbqa65coL98WRhLnDg69NDaOfSCmH85/D0kuyTG7mYIMdBtFXB/IU0QC9USCSGcUGSnQAEx8S0vaXL7JP043kfEfeqwsea598qX+LFa2UfGwgLBpiWi4QEfYy6fviz2TFkbRYKQImybidzUHZkljjPupqu8U4dIx/jsJM/vew717xZPCU0ZCho77TIU+bYSitD5mjnzuD7LrAdbFgnhkD2sQlD/hUW40kPVT/Tq3DrpDRKC9tniiTaIQV1Pe0k82XwYrvV/hTl8T1ed6TuzhmUggqowAbJRbaBIa1zI672AFFQM8OBIN59ZlLy3V2RZW4fvQk2/xMRdVBT0W5Upx+9rCbH9LCGWL8gNNA/PRJ0L9Ts6cq8kf4tFhFQQrk= pbsds@bjarte" - #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDlLTAf5ObSpUU490M/l6+s5m0rxayPeaH23RLvIyoCqGftf/3Yi2iHP8wusBWGrEkXg8Po9YKh2CztflqJBnhsv/HaGYRXNsz3oVf2bSURUepZBkUXkg+T1x9OGG8pfvde8ROWZ8KxwLbAKghHUusyAvtJE9ktDxLpajomXDQlo+v7Hj2v4tMKCG/vHPxf/ni3Icl/8Rwo4zjuxl1MxLftPZv9rxCFv06ujuW6f6Mu5q+damt6ReH7RpOzs1rtDjPSnrRCboY4IbT5P4v6cZCr5hgAblKXHfOzPO9WM7O9tugJeE7eJK6Ps8gvWSHs/48SONSpjcYX3NzsRfxp6RRyD0yGrTDP/Ly6TNZzwZdKPO6GkRbLFXAxSn+ex/zW//R4ECQmof3KPYyjpt7yygICSdRlRocpz5aYxytFqBhelEbQqSZTP8q3HdxqGUplAgaCc0bK+m2ob5cirx3kHK2TyQ2dyCZgOML7AjD3GaclxPjkfEipL3/uFkq6EdsdQFs= pbsds@Svanbjorg" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCo5/9uHIKhhpVbcLSKslj9wdBiV4YaY/tydTfypNZBMMP2U54640t8JvHHkxCZRur8AqYupellxAqkmKn516Ut0WvfQcNgF7ieI66JHkK1j7kSFHHG1nkJHslwCh2PeYtfx5zHZZq8X9v/UjVGY182BC4BHC5zixmNiUvvc+N24BRT4NwslFmMYVcTdoNBSJXPgte4uUd+FZrAnHQrjYdJVANgI4i1d11mxlDFgJrPJj30KaIDxHAsAWgCEqGLMDO9N1cpGGbXVeXfoGvv+vdCXgbyA8BK7wWwXvy5HlvhpEJo8g84r6uKMMkEf+K1MpTiaNjdu+7/sKD/ZOyDB4RgCBs0DskouWRi+xfxABaKBj6706Z3hpj+GfpuSXrHKgGYXIL4cZHaAlz8GVsN1mUL4eJ12Sk14Od2QUHbzp7TDz5eaWuczPs5W9qXwNDMZcmBBZ3mkt9ZYPvAPRjeLpAKhhA9xPL3hbob5hhAENTWsFRFJEgpm8l362XFIOLHr/M= pbsds@rocm" #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHV25/jfk0upLl6JOq1tu1n+VNkMr0OOu8nZa3NBZQfqrGiLQuTTFycBd5hhoWBaZewb0R8jm/GESE4gfeiLtObe0bKXo8SVty5hNrIq06BbICXByJR99ux17psaNyp/dvZO7gkjKm3m30q7TfbZANlIwhv0XmqCz8S31ocJddFznWyK3nFau/Lvzpupi0Y+7yHkmcKiWYzZsjluQF90M5X5nIf2x4jj7WY0IkR2l41MOLk4NCQNIor6EyAXnHs78JBS3kY5p2x7t/cBpMDBmbgZePdfjGv/L4vFgYiG1wTZT77PWPA93GHueZWDGUkIvKbNriP/U+bShKnGjIfZttjerhzsFE1V/RctCFToqHkW39439nCj6eFpgUiLHkx/mAUPz/whKP+9x5I3/DQkgYZ7qA424Msdz2wXWNi3465Mtrf5XPsjWNReEWt9I29W19K5OLO9QQVrkgdioSCvxoHLvQypPscPkLVF8srzCVA6npUOrOuJ5zZcK1ax2/0v8= pbsds@frotbjoff" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDX1n/zBp0Va5VPgUHDJ2tLhR8kzQmkWIdFNVy3WHMzfx2ppR0+ch05ksZ7VYp3ROSMpykdqcjDekM6fD+BJEaHx9MwmHlFgvIVyIVwMwqtheo1gAHW6InsF41c7VRv3dlZgX8ViM9kR6YxCsy8FLkwcRtnQkMnT24LpLvmI6dZA26jAmYvxDO0iSD+7jBf+k1MFJZMxg14tMIcqMnuUhR0OyfORslafM73MKSwFqPeNvJxTq96we5RNBoZfZ63LmAm+EJ/++xoCATWQuSnbrXzIC/tUfHLbn9JUE6OgbTLOCarf/aUQHD5jeevfmNu8DYwtjrqcQsjDt2RySTX1R0OgXDbJe+voOY+9a6mSkpYV37CL5rJGTZYFxLLlC2BZMhmhl/axsK/YGyki9z0zKey65MDl5GxOEaTmVqkextiLMp3qBxvCEOzE6/MsVrOkX/gbNglqFlCVPXxKDBsm5NM/KbqPFuntX+w9UReTAS8MBwBDLM3z0dqT8MaK400wmM= pbsds@noximilien" + #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDX1n/zBp0Va5VPgUHDJ2tLhR8kzQmkWIdFNVy3WHMzfx2ppR0+ch05ksZ7VYp3ROSMpykdqcjDekM6fD+BJEaHx9MwmHlFgvIVyIVwMwqtheo1gAHW6InsF41c7VRv3dlZgX8ViM9kR6YxCsy8FLkwcRtnQkMnT24LpLvmI6dZA26jAmYvxDO0iSD+7jBf+k1MFJZMxg14tMIcqMnuUhR0OyfORslafM73MKSwFqPeNvJxTq96we5RNBoZfZ63LmAm+EJ/++xoCATWQuSnbrXzIC/tUfHLbn9JUE6OgbTLOCarf/aUQHD5jeevfmNu8DYwtjrqcQsjDt2RySTX1R0OgXDbJe+voOY+9a6mSkpYV37CL5rJGTZYFxLLlC2BZMhmhl/axsK/YGyki9z0zKey65MDl5GxOEaTmVqkextiLMp3qBxvCEOzE6/MsVrOkX/gbNglqFlCVPXxKDBsm5NM/KbqPFuntX+w9UReTAS8MBwBDLM3z0dqT8MaK400wmM= pbsds@noximilien" #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHdkKmRB0WjD3L+k8GNTVJDLpOUqLBMW17ld/Jzapo6 pbsds@bolle" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpuDBMll1viLKd/wm1lCy9iozyKeXMBHDwhdJOpeRLe pbsds@nord" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOm2UFDD+qsnKvlBBZ/nhBqY9yeLewwF/bexD2SUL7E3 pbsds@sopp" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILocbYCqu63RT2+mE0l+ZWWw9RVHNcydtLXbLklg6oPe pederbs@pvv" # key has passwd + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILocbYCqu63RT2+mE0l+ZWWw9RVHNcydtLXbLklg6oPe pederbs@pvv" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFZ8xR16u2v8YdGxHQXFA+SBZMzGQXwnhRat7VvTBbl8 furios@FuriPhoneFLX1" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIIGcGEhM6qo3ARAsHx8V/FhryVaG0gOLmL6J1NL3fyn user@pinebook"