pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

lkjdsalkjsadlkj

This commit is contained in:
Peder Bergebakken Sundt 2023-07-09 00:10:03 +02:00
parent bf2389475e
commit 1c9cceea79
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base.nix
View File

@ -32,6 +32,9 @@
nixpkgs.config.allowUnfreePredicate = (pkg: true); nixpkgs.config.allowUnfreePredicate = (pkg: true);
nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg
# TODO: per host?
hardware.enableRedistributableFirmware = true;
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"

2
flake.nix
View File

@ -145,7 +145,7 @@
noximilien = mkConfig "noximilien" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]); noximilien = mkConfig "noximilien" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]);
bolle = mkConfig "bolle" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]); bolle = mkConfig "bolle" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]);
nord = mkConfig "nord" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-cpu-intel-sandy-bridge common-gpu-amd common-hidpi ]); nord = mkConfig "nord" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-cpu-intel-sandy-bridge common-gpu-amd common-hidpi ]);
sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]); sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia ]);
}; };
homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let

14
hosts/sopp/default.nix
View File

@ -14,9 +14,9 @@
#hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest;
#hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start #hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start
# PRIME: # PRIME: (lspci)
#hardware.nvidia.prime.intelBusId = "PCI:0:02:0"; hardware.nvidia.prime.intelBusId = "PCI:0:02:0";
#hardware.nvidia.prime.nvidiaBusId = "PCI:1:00:0"; hardware.nvidia.prime.nvidiaBusId = "PCI:1:00:0";
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -113,7 +113,13 @@
]; ];
# nvidia bad # nvidia bad
nixpkgs.config.packageOverrides = (pkgs: { nixpkgs.config.packageOverrides = lib.mkIf (!config.hardware.nvidia.prime.offload.enable) (pkgs: {
teams = pkgs.teams.overrideAttrs (old: rec {
postInstall = (old.postInstall or "") + ''
substituteInPlace $out/share/applications/teams.desktop \
--replace 'Exec=teams' 'Exec=teams --disable-gpu'
'';
});
discord = pkgs.discord.overrideAttrs (old: rec { discord = pkgs.discord.overrideAttrs (old: rec {
desktopItem = old.desktopItem.override (old: { desktopItem = old.desktopItem.override (old: {
#exec = "${pkgs.coreutils}/bin/env NIXOS_OZONE_WL=1 ${old.exec}"; #exec = "${pkgs.coreutils}/bin/env NIXOS_OZONE_WL=1 ${old.exec}";

3
users/pbsds/home/profiles/desktop.nix
View File

@ -18,6 +18,9 @@
element-desktop#-wayland element-desktop#-wayland
slack slack
telegram-desktop telegram-desktop
teams
zoom-us
f3d f3d
firefox firefox
zotero zotero

2
users/pbsds/home/profiles/shell.nix
View File

@ -40,7 +40,7 @@
home.shellAliases.dc = "cd"; home.shellAliases.dc = "cd";
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true; #programs.direnv.nix-direnv.enable = true;
programs.tealdeer.enable = true; programs.tealdeer.enable = true;