diff --git a/README.md b/README.md index 6c24dd1..dc24def 100644 --- a/README.md +++ b/README.md @@ -25,24 +25,26 @@ * [ ] autogenerate ssh keys * [ ] switch to systemd networkd * [ ] pre-commit hook with 'nix eval ...outPath' -* [ ] use `nom` when deploying +* [x] use `nom` when deploying * [ ] figure out how to reuse system flake lock while deplying, leave the night job to upgrade * [ ] users/pbsds: Support multiple profiles, like headless, nixpkgs-dev, various desktops, hpc, pvv, etc * [ ] gnome: - * [ ] lxterminal - * [ ] themes - * [ ] shortcuts + * [x] lxterminal + * [ ] replace gnome terminal + * [x] themes + * [x] shortcuts * [ ] pavucontrol - * [ ] * [ ] nixos-generate-config instructions for new hosts * [ ] zfs, declarative pools? * [ ] some tunneling for NFS hosts +* [ ] transgui config * [ ] secrets - nix-sops ? * flexget * transmission + * transmission remote gui * domeneshop * [ ] hydra -* [ ] self-hosted binary cache (single-machine) (nix-serve, carinae, harmonia, eris or attic) +* [ ] self-hosted binary cache (single-machine) (nix-serve, carinae, harmonia, eris or attic, ssh?) * https://discourse.nixos.org/t/announcing-harmonia-a-nix-binary-cache-written-in-rust/19855 * https://discourse.nixos.org/t/introducing-attic-a-self-hostable-nix-binary-cache-server/24343/1 * [ ] profiles/web: make ACME/nginx helper a function diff --git a/hardware/cuda.nix b/hardware/cuda.nix index 281a40a..846ae87 100644 --- a/hardware/cuda.nix +++ b/hardware/cuda.nix @@ -5,7 +5,7 @@ # https://nixos.wiki/wiki/Nvidia - nixpkgs.config.cudaSupport = true; + #nixpkgs.config.cudaSupport = true; # TODO: TOO SLOW, BREAKS nixpkgs.config.allowUnfreePredicate = pkg: lib.any (x: x) [ (lib.hasInfix "nvidia" (lib.toLower (lib.getName pkg))) (lib.hasInfix "cuda" (lib.toLower (lib.getName pkg))) @@ -28,7 +28,7 @@ environment.systemPackages = with pkgs; ([ nvtop - ] ++ lib.optional hardware.nvidia.prime.offload.enable [ + ] ++ lib.optional config.hardware.nvidia.prime.offload.enable [ (writeShellScriptBin "prime-run" '' export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 diff --git a/hardware/rocm.nix b/hardware/rocm.nix index c24d805..e58b0d5 100644 --- a/hardware/rocm.nix +++ b/hardware/rocm.nix @@ -5,11 +5,12 @@ # https://libreddit.noximilien.pbsds.net/r/archlinux/comments/nih9c9/amdgpu_vs_modesetting_in_current_510_kernels_xorg/ + nixpkgs.config.rocmSupport = true; + hardware.opengl.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; # use gpu, adaptive sync and and hardware page flipping #services.xserver.videoDrivers = [ "modesetting" ]; # integrated (non-accelerated) framebuffer, KMS - nixpkgs.config.rocmSupport = true; systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.hip}" ]; diff --git a/profiles/desktop/flatpak.nix b/profiles/desktop/flatpak.nix index d99bb74..b1ca947 100644 --- a/profiles/desktop/flatpak.nix +++ b/profiles/desktop/flatpak.nix @@ -3,6 +3,12 @@ { services.flatpak.enable = true; + # TODO: integrate into gnome-software + + # TODO: somehow run this, like i do in home-manager + # flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo + + # fix missing fonts in flatpak, without resorting to copying fonts to a dedicated folder # via https://github.com/NixOS/nixpkgs/issues/119433#issuecomment-1326957279 system.fsPackages = [ pkgs.bindfs ]; diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix index 7387967..356e513 100644 --- a/profiles/desktop/gnome/default.nix +++ b/profiles/desktop/gnome/default.nix @@ -16,6 +16,7 @@ services.gnome.sushi.enable = true; environment.systemPackages = with pkgs; [ + pavucontrol lxterminal ffmpegthumbnailer gnomeExtensions.appindicator diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix index 482e320..4aea93e 100644 --- a/users/pbsds/home/profiles/desktop.nix +++ b/users/pbsds/home/profiles/desktop.nix @@ -2,6 +2,7 @@ { home.packages = with pkgs; [ atom # TODO: config + #pulsar discord element-desktop#-wayland f3d @@ -9,7 +10,7 @@ gnome-connections scrcpy slack - #spotify + #spotify # use the flatpak instead transgui #transmission-remote-gtk gnome.eog ]; diff --git a/users/pbsds/home/profiles/gnome/default.nix b/users/pbsds/home/profiles/gnome/default.nix index 03d3b73..868b4a4 100644 --- a/users/pbsds/home/profiles/gnome/default.nix +++ b/users/pbsds/home/profiles/gnome/default.nix @@ -38,7 +38,8 @@ ]; #dump "org/gnome/settings-daemon/plugins/power" - dconf.settings = { + dconf.settings = with lib.hm.gvariant; { + # extensions: "org/gnome/shell" = { disable-user-extensions = false; # dconf dump /org/gnome/shell/ | grep ^enabled-extensions= @@ -69,6 +70,7 @@ picture-uri = "file://${../../files/screensaver.jpg}"; }; + # theme "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; enable-hot-corners = false; @@ -77,6 +79,8 @@ #"org/gnome/desktop/wm/preferences" = { # button-layout = ":minimize,close"; #}; + + # behaviour "org/gnome/desktop/peripherals/touchpad" = { disable-while-typing = false; natural-scroll = false; @@ -97,5 +101,14 @@ "org/gtk/settings/file-chooser" = { sort-directories-first = true; }; + + "org/gnome/settings-daemon/plugins/color" = { + night-light-enabled = true; + night-light-schedule-automatic = false; + night-light-schedule-from = 23.5; + night-light-schedule-to = 5.0; + night-light-temperature = mkUint32 4150; + }; + }; }