From 54ba2cfd56effb0bf0c7dd774fb4fd80b0e12e7c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 23 Jun 2023 21:45:16 +0200 Subject: [PATCH] lots --- base.nix | 3 ++- flake.nix | 1 + hardware/{ => gpu}/cuda.nix | 3 ++- hardware/{opengl-intel.nix => gpu/intel.nix} | 0 hardware/{ => gpu}/rocm.nix | 9 +++++++-- hosts/bolle/default.nix | 5 ----- hosts/nord/default.nix | 13 ++----------- hosts/noximilien/default.nix | 9 ++------- hosts/sopp/default.nix | 16 +++------------- profiles/desktop/gnome/default.nix | 4 +++- profiles/shell/base.nix | 7 +++++-- profiles/shell/nix-utils.nix | 2 ++ users/pbsds/default.nix | 6 +++++- users/pbsds/home/default.nix | 1 + users/pbsds/home/profiles/desktop.nix | 5 +++-- users/pbsds/home/profiles/gnome/default.nix | 4 +++- 16 files changed, 41 insertions(+), 47 deletions(-) rename hardware/{ => gpu}/cuda.nix (95%) rename hardware/{opengl-intel.nix => gpu/intel.nix} (100%) rename hardware/{ => gpu}/rocm.nix (79%) diff --git a/base.nix b/base.nix index 4897512..876accc 100644 --- a/base.nix +++ b/base.nix @@ -48,7 +48,8 @@ environment.etc."current-system-flake".source = inputs.self; # the plan was to allow me to locate the new flake.lock, but alas https://github.com/NixOS/nix/issues/6895 /**/ - environment.shells = with pkgs; [ bash zsh ]; + environment.shells = with pkgs; [ bashInteractive zsh ]; # TODO: needed? + programs.zsh.enable = true; nix.settings.allowed-users = [ "*" ]; # default #nix.settings.allowed-users = [ "@nixbld" "@builders" ]; # TODO: this diff --git a/flake.nix b/flake.nix index 8786990..9bf4723 100644 --- a/flake.nix +++ b/flake.nix @@ -138,6 +138,7 @@ nixos-rebuild-nom pkgs.home-manager pkgs.nix-output-monitor + pkgs.cachix ]; envrc-remote = mkShell [ remote-exec diff --git a/hardware/cuda.nix b/hardware/gpu/cuda.nix similarity index 95% rename from hardware/cuda.nix rename to hardware/gpu/cuda.nix index 8c0cddf..3273c43 100644 --- a/hardware/cuda.nix +++ b/hardware/gpu/cuda.nix @@ -6,6 +6,7 @@ # https://nixos.wiki/wiki/Nvidia #nixpkgs.config.cudaSupport = true; # TODO: TOO SLOW, BREAKS + #nixpkgs.config.nvidiaSupport = true; # TODO: used only by zenith nixpkgs.config.allowUnfreePredicate = pkg: lib.any (x: x) [ (lib.hasInfix "nvidia" (lib.toLower (lib.getName pkg))) (lib.hasInfix "cuda" (lib.toLower (lib.getName pkg))) @@ -27,7 +28,7 @@ #}; environment.systemPackages = with pkgs; ([ - nvtop + nvtop-nvidia ] ++ lib.optional config.hardware.nvidia.prime.offload.enable [ (writeShellScriptBin "prime-run" '' diff --git a/hardware/opengl-intel.nix b/hardware/gpu/intel.nix similarity index 100% rename from hardware/opengl-intel.nix rename to hardware/gpu/intel.nix diff --git a/hardware/rocm.nix b/hardware/gpu/rocm.nix similarity index 79% rename from hardware/rocm.nix rename to hardware/gpu/rocm.nix index e58b0d5..b68b6b7 100644 --- a/hardware/rocm.nix +++ b/hardware/gpu/rocm.nix @@ -3,11 +3,16 @@ # assumes common-gpu-amd from nixos-hardware is also added # TODO: should we move it from flake.nix to here? - # https://libreddit.noximilien.pbsds.net/r/archlinux/comments/nih9c9/amdgpu_vs_modesetting_in_current_510_kernels_xorg/ + # nixos-hardware common-amd option + hardware.amdgpu.opencl = true; + + nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ? nixpkgs.config.rocmSupport = true; + hardware.opengl.enable = true; + # https://libreddit.noximilien.pbsds.net/r/archlinux/comments/nih9c9/amdgpu_vs_modesetting_in_current_510_kernels_xorg/ services.xserver.videoDrivers = [ "amdgpu" ]; # use gpu, adaptive sync and and hardware page flipping #services.xserver.videoDrivers = [ "modesetting" ]; # integrated (non-accelerated) framebuffer, KMS @@ -15,6 +20,6 @@ "L+ /opt/rocm/hip - - - - ${pkgs.hip}" ]; environment.systemPackages = with pkgs; [ - nvtop + nvtop-amd ]; } diff --git a/hosts/bolle/default.nix b/hosts/bolle/default.nix index 22edbb6..b5d154d 100644 --- a/hosts/bolle/default.nix +++ b/hosts/bolle/default.nix @@ -56,11 +56,6 @@ environment.systemPackages = with pkgs; [ cage weston - dialog - zenith - vimix-gtk-themes - flat-remix-icon-theme - feh ]; # TODO: remove? Move? diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix index 4c5745d..bfe927c 100644 --- a/hosts/nord/default.nix +++ b/hosts/nord/default.nix @@ -15,8 +15,8 @@ imports = [ ./hardware-configuration.nix - ../../hardware/rocm.nix - ../../hardware/opengl-intel.nix + ../../hardware/gpu/rocm.nix + ../../hardware/gpu/intel.nix ../../users # home-manager ../../users/pbsds @@ -70,15 +70,6 @@ environment.systemPackages = with pkgs; [ cage weston - dialog - zenith - vimix-gtk-themes - flat-remix-icon-theme - feh - - zotero - - firefox ]; # TODO: remove? Move? diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index 42641af..67d4fd3 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -6,7 +6,7 @@ boot.loader.grub.useOSProber = true; imports = [ ./hardware-configuration.nix - ../../hardware/opengl-intel.nix + ../../hardware/gpu/intel.nix ../../users # home-manager ../../users/pbsds @@ -36,7 +36,7 @@ ../../profiles/web/services/netdata.nix ../../profiles/web/services/nitter.nix #../../profiles/web/services/ntopng.nix - ../../profiles/web/services/owncast.nix + #../../profiles/web/services/owncast.nix #../../profiles/web/services/paperless.nix ../../profiles/web/services/polaris.nix #../../profiles/web/services/resilio.nix @@ -124,11 +124,6 @@ environment.systemPackages = with pkgs; [ cage weston - dialog - zenith - vimix-gtk-themes - flat-remix-icon-theme - feh ]; # TODO: remove? Move? diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix index d0475c0..00c14d5 100644 --- a/hosts/sopp/default.nix +++ b/hosts/sopp/default.nix @@ -10,12 +10,12 @@ systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false; - boot.kernelPackages = pkgs.linuxPackages_latest; # amdgpu audio fix when at 4k@60fps + #boot.kernelPackages = pkgs.linuxPackages_latest; # amdgpu audio fix when at 4k@60fps imports = [ ./hardware-configuration.nix - ../../hardware/cuda.nix - ../../hardware/opengl-intel.nix + ../../hardware/gpu/cuda.nix + ../../hardware/gpu/intel.nix ../../users # home-manager ../../users/pbsds @@ -87,20 +87,10 @@ #TODO: avahi? resolved? https://git.pvv.ntnu.no/Drift/pvv-nixos-config/src/main/base.nix#L15-L18 - # Installed system packages environment.systemPackages = with pkgs; [ cage weston - dialog - zenith - vimix-gtk-themes - flat-remix-icon-theme - feh - - zotero - - firefox ]; # TODO: remove? Move? diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix index c674ad4..c757325 100644 --- a/profiles/desktop/gnome/default.nix +++ b/profiles/desktop/gnome/default.nix @@ -12,10 +12,12 @@ programs.gnome-terminal.enable = false; - services.tumbler.enable = true; + services.tumbler.enable = true; # TODO: needed when we have ffmpegthumbnailer? services.gnome.sushi.enable = true; + services.gnome.gnome-online-accounts.enable = true; environment.systemPackages = with pkgs; [ + firefox pavucontrol lxterminal # TODO: shadow gnome-terminal diff --git a/profiles/shell/base.nix b/profiles/shell/base.nix index 67f71ba..ce40db3 100644 --- a/profiles/shell/base.nix +++ b/profiles/shell/base.nix @@ -27,15 +27,16 @@ strace killall - pciutils htop glances + bottom + zenith #sshfs entr tealdeer # tldr, but rust - axel aria + axel aria aria2 bat xe # xargs alternative sd # sed alternative @@ -49,6 +50,8 @@ du-dust # du alternative ncdu # Disk usage analyzer with an ncurses interface + dialog # remove? + visidata sqlite ]; diff --git a/profiles/shell/nix-utils.nix b/profiles/shell/nix-utils.nix index 1d92cbc..c80b9ae 100644 --- a/profiles/shell/nix-utils.nix +++ b/profiles/shell/nix-utils.nix @@ -12,5 +12,7 @@ #comma nixfmt alejandra + #nixpkgs-hammering + #nixpkgs-review ]; } diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index 92b9e4c..1068a48 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -7,7 +7,11 @@ vimv xclip fzf - #rmate-sh # TODO: add to nixpkgs + rmate-sh + + vimix-gtk-themes + flat-remix-icon-theme + feh ]; # TODO: fzf for zsh programs.bash.shellInit = '' diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index 38674ce..9fbcce3 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -71,6 +71,7 @@ #nix-template nix-output-monitor nixpkgs-review + nixpkgs-hammering manix comma diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix index d4ab321..72ba8a0 100644 --- a/users/pbsds/home/profiles/desktop.nix +++ b/users/pbsds/home/profiles/desktop.nix @@ -5,14 +5,15 @@ pulsar # TODO: config, transition into this discord element-desktop#-wayland + slack f3d firefox + zotero + gnome.eog gnome-connections scrcpy - slack #spotify # use the flatpak instead transgui #transmission-remote-gtk - gnome.eog ]; # flatpak diff --git a/users/pbsds/home/profiles/gnome/default.nix b/users/pbsds/home/profiles/gnome/default.nix index 05790f6..a05b389 100644 --- a/users/pbsds/home/profiles/gnome/default.nix +++ b/users/pbsds/home/profiles/gnome/default.nix @@ -27,6 +27,7 @@ gnomeExtensions.appindicator gnomeExtensions.removable-drive-menu gnomeExtensions.always-show-titles-in-overview + gnomeExtensions.no-titlebar-when-maximized /* TODO: gnomeExtensions.night-light-slider gnomeExtensions.tray-icons-reloaded @@ -42,7 +43,7 @@ # extensions: "org/gnome/shell" = { disable-user-extensions = false; - # dconf dump /org/gnome/shell/ | grep ^enabled-extensions= + # dconf dump /org/gnome/shell/ | grep ^enabled-extensions= | grep -E '\[.*\]' -o | sd ', ' '\n,' enabled-extensions = [ "bluetooth-quick-connect@bjarosze.gmail.com" "gTile@vibou" @@ -55,6 +56,7 @@ "appindicatorsupport@rgcjonas.gmail.com" "drive-menu@gnome-shell-extensions.gcampax.github.com" "Always-Show-Titles-In-Overview@gmail.com" + "no-titlebar-when-maximized@alec.ninja" ]; };