misc general changes / nixpkgs break fixes
This commit is contained in:
parent
4b90113a54
commit
a5b19fc918
|
@ -75,6 +75,7 @@
|
|||
./modules/devenv
|
||||
./modules/system.nix
|
||||
./modules/hyprland
|
||||
./modules/xserver
|
||||
./systems/msi
|
||||
];
|
||||
};
|
||||
|
|
|
@ -1,14 +1,23 @@
|
|||
{ inputs, pkgs, ... }: {
|
||||
{ inputs, lib, pkgs, ... }: {
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"osu-lazer-bin"
|
||||
"unrar"
|
||||
"steam"
|
||||
"steam-original"
|
||||
"corefonts"
|
||||
"vista-fonts"
|
||||
"steam-unwrapped"
|
||||
];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-24.8.6"
|
||||
"electron-25.9.0"
|
||||
"jitsi-meet-1.0.8043"
|
||||
"electron-28.3.3"
|
||||
"electron-27.3.11"
|
||||
];
|
||||
|
||||
documentation = {
|
||||
|
@ -25,8 +34,10 @@
|
|||
];
|
||||
|
||||
nix = {
|
||||
# hardlink duplicate files in the nix store
|
||||
settings.auto-optimise-store = true;
|
||||
settings = {
|
||||
# hardlink duplicate files in the nix store
|
||||
auto-optimise-store = true;
|
||||
};
|
||||
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
|
@ -34,6 +45,8 @@
|
|||
# keep intermediary deps alive (no redownloading to rebuild after gc)
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
|
||||
# flake registries are used by the new nix commands.
|
||||
|
@ -49,6 +62,18 @@
|
|||
"nixpkgs=/etc/nix/inputs/nixpkgs"
|
||||
"stable=/etc/nix/inputs/stable"
|
||||
];
|
||||
|
||||
distributedBuilds = true;
|
||||
buildMachines = [ {
|
||||
hostName = "192.168.2.1";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
supportedFeatures = [ "big-parallel" "kvm" "nixos-test" "benchmark" ];
|
||||
speedFactor = 100;
|
||||
maxJobs = 16;
|
||||
sshUser = "nix-remote-build";
|
||||
sshKey = "/root/.ssh/id_build_server";
|
||||
} ];
|
||||
};
|
||||
|
||||
# add entries for `nixPath` above.
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
{ system, inputs, impurity, lib, config, pkgs, ... }: let
|
||||
inherit (inputs) hyprland hyprland-hy3 quickshell;
|
||||
inherit (inputs) hyprland hyprsunset hyprpicker hyprland-hy3 quickshell;
|
||||
|
||||
exe = hyprland.packages.${system}.default.overrideAttrs (final: prev: {
|
||||
dontStrip = true;
|
||||
});
|
||||
|
||||
# I blame home manager
|
||||
wrapper = pkgs.callPackage ({ ... }: pkgs.writeShellScriptBin "hyprland" ''
|
||||
${builtins.readFile ./session.sh}
|
||||
${config.hyprland-session.prerun}
|
||||
${hyprland.packages.${system}.default}/bin/Hyprland $@
|
||||
${lib.getExe exe} $@
|
||||
'') {};
|
||||
in {
|
||||
imports = [ hyprland.nixosModules.default ];
|
||||
|
@ -20,6 +24,12 @@ in {
|
|||
type = types.separatedString "\n";
|
||||
default = "";
|
||||
};
|
||||
|
||||
# same as above but no impurity so the greeter works
|
||||
extraConfigStatic = mkOption {
|
||||
type = types.separatedString "\n";
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
|
@ -54,7 +64,10 @@ in {
|
|||
grim
|
||||
slurp
|
||||
playerctl
|
||||
wf-recorder
|
||||
wl-screenrec
|
||||
|
||||
hyprsunset.packages.${system}.default
|
||||
hyprpicker.packages.${system}.default
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
exec-once = quickshell -c shell
|
||||
exec-once = qs -c shell
|
||||
|
||||
exec = systemctl start --user emacs.service && emacsclient -e "(setenv \"HYPRLAND_INSTANCE_SIGNATURE\" \"$HYPRLAND_INSTANCE_SIGNATURE\")"
|
||||
|
||||
|
@ -17,7 +17,6 @@ input {
|
|||
kb_layout = us
|
||||
sensitivity = 0
|
||||
follow_mouse = 1
|
||||
mouse_refocus = false
|
||||
accel_profile = flat
|
||||
}
|
||||
|
||||
|
@ -31,13 +30,17 @@ decoration {
|
|||
noise = 0.008
|
||||
contrast = 0.8916
|
||||
brightness = 0.8
|
||||
input_methods = yes
|
||||
}
|
||||
|
||||
drop_shadow = no
|
||||
shadow {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
|
||||
animations {
|
||||
enabled = yes
|
||||
first_launch_animation = no
|
||||
|
||||
bezier = windowIn, 0.06, 0.71, 0.25, 1
|
||||
bezier = windowResize, 0.04, 0.67, 0.38, 1
|
||||
|
@ -48,7 +51,7 @@ animations {
|
|||
animation = border, 1, 10, default
|
||||
animation = borderangle, 1, 8, default
|
||||
animation = fade, 1, 3, default
|
||||
animation = workspaces, 1, 6, default
|
||||
animation = workspaces, 1, 6, default, slidevert
|
||||
animation = layers, 1, 5, windowIn, slide
|
||||
}
|
||||
|
||||
|
@ -62,22 +65,28 @@ gestures {
|
|||
misc {
|
||||
disable_hyprland_logo = true
|
||||
disable_splash_rendering = true
|
||||
vrr = 1
|
||||
no_direct_scanout = false
|
||||
key_press_enables_dpms = true
|
||||
}
|
||||
|
||||
render {
|
||||
explicit_sync = true
|
||||
#direct_scanout = true
|
||||
}
|
||||
|
||||
binds {
|
||||
workspace_back_and_forth = true
|
||||
}
|
||||
|
||||
plugin {
|
||||
hy3 {
|
||||
tabs {
|
||||
height = 2
|
||||
padding = 6
|
||||
render_text = false
|
||||
}
|
||||
tabs {
|
||||
border_width = 1
|
||||
col.active = rgba(33ccff20)
|
||||
col.border.active = rgba(33ccffee)
|
||||
col.text.active = rgba(ffffffff)
|
||||
col.inactive = rgba(30303020)
|
||||
col.border.inactive = rgba(595959aa)
|
||||
}
|
||||
|
||||
autotile {
|
||||
enable = true
|
||||
|
@ -87,8 +96,13 @@ plugin {
|
|||
}
|
||||
}
|
||||
|
||||
misc {
|
||||
vfr = on
|
||||
}
|
||||
|
||||
debug {
|
||||
disable_logs = no
|
||||
overlay = off
|
||||
}
|
||||
|
||||
monitor = , preferred, auto, 1
|
||||
|
@ -110,10 +124,15 @@ layerrule = animation fade, shell:background
|
|||
layerrule = blur, shell:bar
|
||||
layerrule = blurpopups, shell:bar
|
||||
layerrule = ignorezero, shell:bar
|
||||
layerrule = noanim, shell:bar
|
||||
layerrule = blur, shell:notifications
|
||||
layerrule = ignorezero, shell:notifications
|
||||
layerrule = noanim, shell:notifications
|
||||
|
||||
layerrule = noanim, shell:screenshot
|
||||
|
||||
layerrule = blur, shell:launcher
|
||||
layerrule = ignorezero, shell:launcher
|
||||
layerrule = animation popin 90%, shell:launcher
|
||||
|
||||
windowrulev2 = float, class:^(opensnitch_ui)$
|
||||
windowrulev2 = dimaround, class:^(opensnitch_ui)$
|
||||
|
@ -125,11 +144,12 @@ windowrulev2 = float, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
|||
windowrulev2 = size 1000 700, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
||||
windowrulev2 = center, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
||||
windowrulev2 = dimaround, class:^(org.freedesktop.impl.portal.desktop.kde)$
|
||||
windowrulev2 = float, title:^(OpenSSH Authentication Passphrase request)$
|
||||
|
||||
windowrulev2 = float, class:^(AlacrittyFloating)$
|
||||
|
||||
$mod = SUPER
|
||||
$launcher = walker
|
||||
$launcher = qs msg -c shell launcher open
|
||||
|
||||
bind = $mod+SHIFT, m, exit
|
||||
|
||||
|
@ -138,12 +158,12 @@ bind = $mod+SHIFT, return, exec, alacritty --class AlacrittyFloating
|
|||
bind = $mod, grave, exec, $launcher
|
||||
bind = $mod+SHIFT, q, hy3:killactive
|
||||
|
||||
bind = $mod+SHIFT, s, global, shell:screenshot
|
||||
bind = $mod, c, global, shell:termselect
|
||||
bind = $mod, PERIOD, exec, quickshell -c lockscreen
|
||||
bind = $mod+SHIFT, s, exec, qs msg -c shell screenshot takeScreenshot
|
||||
bind = $mod, PERIOD, exec, qs msg -c shell lockscreen lock
|
||||
|
||||
bind = $mod, f, fullscreen, 1
|
||||
bind = $mod+SHIFT, f, fullscreen, 0
|
||||
bind = $mod, tab, hy3:togglefocuslayer
|
||||
bind = $mod+SHIFT, tab, togglefloating
|
||||
|
||||
bind = $mod, d, hy3:makegroup, h
|
||||
|
@ -162,10 +182,18 @@ bindn = , mouse_down, hy3:focustab, l, require_hovered
|
|||
bindn = , mouse_up, hy3:focustab, r, require_hovered
|
||||
bind = $mod, q, hy3:warpcursor
|
||||
|
||||
bind = ,XF86AudioPlay, exec, playerctl play-pause
|
||||
bind = ,XF86AudioStop, exec, playerctl -a stop
|
||||
bind = ,XF86AudioNext, exec, playerctl next
|
||||
bind = ,XF86AudioPrev, exec, playerctl previous
|
||||
bind = $mod, i, exec, hyprctl keyword plugin:hy3:tabs:height 20
|
||||
bind = $mod, i, exec, hyprctl keyword plugin:hy3:tabs:render_text true
|
||||
bind = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:height 20
|
||||
bind = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:render_text true
|
||||
|
||||
bindr = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:height 2
|
||||
bindr = $mod, o, exec, hyprctl keyword plugin:hy3:tabs:render_text false
|
||||
|
||||
bind = ,XF86AudioStop, exec, qs msg -c shell mpris pauseAll
|
||||
bind = ,XF86AudioPlay, exec, qs msg -c shell mpris playPause
|
||||
bind = ,XF86AudioNext, exec, qs msg -c shell mpris next
|
||||
bind = ,XF86AudioPrev, exec, qs msg -c shell mpris previous
|
||||
|
||||
bind = $mod, h, hy3:movefocus, l
|
||||
bind = $mod, j, hy3:movefocus, d
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
# session
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
export XDG_SESSION_DESKTOP=hyprland
|
||||
export XDG_CURRENT_DESKTOP=hyprland
|
||||
|
||||
# firefox
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
|
@ -28,7 +26,7 @@ export NIXOS_OZONE_WL=1
|
|||
|
||||
# cursed dbus
|
||||
|
||||
dbus-update-activation-environment --systemd MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_QPA_PLATFORMTHEME QT_WAYLAND_DISABLE_WINDOWDECORATION SDL_VIDEODRIVER _JAVA_AWT_WM_NONREPARENTING JDK_JAVA_OPTIONS XCURSOR_SIZE XCURSOR_THEME
|
||||
dbus-update-activation-environment --systemd MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_QPA_PLATFORMTHEME QT_WAYLAND_DISABLE_WINDOWDECORATION SDL_VIDEODRIVER _JAVA_AWT_WM_NONREPARENTING JDK_JAVA_OPTIONS XCURSOR_SIZE XCURSOR_THEME NIXOS_OZONE_WL
|
||||
|
||||
# theme in dbus:
|
||||
# QT_PLUGIN_PATH=<qt5ct>/lib/qt-ver/plugins + breeze will correctly set the theme.
|
||||
|
|
|
@ -11,35 +11,55 @@
|
|||
|
||||
programs.dconf.enable = true;
|
||||
|
||||
#services.cpupower-gui.enable = true;
|
||||
|
||||
# power management
|
||||
services.tlp.enable = true;
|
||||
|
||||
# battery status in ironbar
|
||||
services.upower.enable = true;
|
||||
services.power-profiles-daemon.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
git-lfs
|
||||
vim
|
||||
];
|
||||
|
||||
services.ntp.enable = true;
|
||||
|
||||
networking = {
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
dns = "systemd-resolved";
|
||||
dns = lib.mkForce "systemd-resolved";
|
||||
};
|
||||
|
||||
nameservers = [ "9.9.9.9" ];
|
||||
|
||||
useNetworkd = true;
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
dnssec = "true";
|
||||
fallbackDns = [ "9.9.9.9" ];
|
||||
extraConfig = ''
|
||||
DNSOverTLS=yes
|
||||
'';
|
||||
#fallbackDns = [ "no" ];
|
||||
dnssec = "false";
|
||||
};
|
||||
|
||||
services.dnsmasq = {
|
||||
enable = true;
|
||||
resolveLocalQueries = false;
|
||||
|
||||
settings = {
|
||||
listen-address = "127.0.0.55";
|
||||
bind-interfaces = true;
|
||||
address = [ "/foo.site/127.1.0.1" ];
|
||||
server = [ "9.9.9.9" ];
|
||||
};
|
||||
};
|
||||
|
||||
systemd.network = {
|
||||
networks.wlp4s0 = {
|
||||
matchConfig.Name = "wlp4s0";
|
||||
networkConfig.DHCP = "yes";
|
||||
dhcpV4Config.UseDNS = "no";
|
||||
dhcpV6Config.UseDNS = "no";
|
||||
};
|
||||
|
||||
wait-online.anyInterface = true;
|
||||
};
|
||||
|
||||
# removable disks in file manager
|
||||
|
@ -47,4 +67,12 @@
|
|||
|
||||
programs.adb.enable = true;
|
||||
users.users.${config.main-user}.extraGroups = [ "adbusers" ];
|
||||
|
||||
services.tailscale.enable = true;
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
enableExtraSocket = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,10 +4,12 @@
|
|||
clang-tools_16
|
||||
jdt-language-server
|
||||
kotlin-language-server
|
||||
typescript-language-server
|
||||
astro-language-server
|
||||
glslls
|
||||
|
||||
bear
|
||||
gdb
|
||||
pwndbg
|
||||
];
|
||||
|
||||
systemd.user.sessionVariables = {
|
||||
|
|
|
@ -1,15 +1,43 @@
|
|||
{ system, inputs, pkgs, config, ... }: {
|
||||
{ lib, system, inputs, pkgs, config, ... }: {
|
||||
imports = [ ./modules/greetd ];
|
||||
|
||||
system.extraDependencies = with pkgs; [ ungoogled-chromium ];
|
||||
|
||||
environment.systemPackages = with pkgs; [ nix-output-monitor ];
|
||||
environment.sessionVariables.FLAKE = "/home/admin/nixnew";
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
extraCompatPackages = [
|
||||
pkgs.proton-ge-bin
|
||||
];
|
||||
};
|
||||
|
||||
fonts = {
|
||||
enableDefaultPackages = false;
|
||||
|
||||
packages = with inputs.stable.legacyPackages.${system}; [
|
||||
packages = (with inputs.stable.legacyPackages.${system}; [
|
||||
dejavu_fonts
|
||||
nerdfonts
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
];
|
||||
]) ++ (with pkgs; [
|
||||
corefonts
|
||||
vistafonts
|
||||
]);
|
||||
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "DejaVu Serif" ];
|
||||
sansSerif = [ "DejaVu Sans" ];
|
||||
monospace = [ "JetBrainsMono Nerd Font" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
enableAskPassword = true;
|
||||
askPassword = lib.getExe pkgs.lxqt.lxqt-openssh-askpass;
|
||||
};
|
||||
|
||||
systemd = {
|
||||
|
@ -35,7 +63,7 @@
|
|||
programs = {
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
pinentryFlavor = "gnome3";
|
||||
pinentryPackage = pkgs.pinentry-qt;
|
||||
};
|
||||
kdeconnect = {
|
||||
package = pkgs.kdePackages.kdeconnect-kde;
|
||||
|
@ -79,13 +107,12 @@
|
|||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
kdePackages.ark
|
||||
kwrite
|
||||
krita
|
||||
gimp
|
||||
vlc
|
||||
mpv
|
||||
gpicview
|
||||
qimgv
|
||||
kdePackages.filelight kdePackages.kirigami kdePackages.kquickcharts # deps
|
||||
curl
|
||||
cantata
|
||||
|
@ -96,18 +123,22 @@
|
|||
htop
|
||||
btop
|
||||
speedcrunch
|
||||
libreoffice
|
||||
nnn
|
||||
libreoffice-qt6
|
||||
ripgrep
|
||||
qbittorrent
|
||||
signal-desktop
|
||||
anki-bin
|
||||
kid3
|
||||
wireshark
|
||||
mumble
|
||||
freetube
|
||||
|
||||
distrobox
|
||||
xdg-utils
|
||||
light
|
||||
|
||||
unrar # used by ark
|
||||
libnotify # test with it a lot
|
||||
];
|
||||
|
||||
programs = {
|
||||
|
@ -124,7 +155,7 @@
|
|||
services = {
|
||||
mpd = {
|
||||
enable = true;
|
||||
musicDirectory = "${homeConfig.home.homeDirectory}/Music";
|
||||
musicDirectory = "/pool/music";
|
||||
network.startWhenNeeded = true;
|
||||
|
||||
extraConfig = ''
|
||||
|
|
1
modules/user/modules/xserver/default.nix
Normal file
1
modules/user/modules/xserver/default.nix
Normal file
|
@ -0,0 +1 @@
|
|||
|
14
modules/xserver/default.nix
Normal file
14
modules/xserver/default.nix
Normal file
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
logFile = null;
|
||||
display = 7;
|
||||
|
||||
libinput = {
|
||||
enable = true;
|
||||
mouse.accelProfile = "flat";
|
||||
};
|
||||
|
||||
displayManager.startx.enable = true;
|
||||
};
|
||||
}
|
|
@ -1,12 +1,48 @@
|
|||
{ pkgs, ... }: {
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./mullvad.nix
|
||||
./hyprland
|
||||
./mcontrolcenter.nix
|
||||
];
|
||||
|
||||
services.timesyncd.enable = true;
|
||||
|
||||
services.sshd.enable = true;
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
networking.hostName = "msi";
|
||||
time.timeZone = "America/Vancouver";
|
||||
programs.noisetorch.enable = true;
|
||||
|
||||
home-manager.users.${config.main-user} = {
|
||||
home.packages = with pkgs; [
|
||||
osu-lazer-bin
|
||||
];
|
||||
|
||||
services.blueman-applet.enable = true;
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall.allowedTCPPorts = [
|
||||
40921 # bittorrent
|
||||
49775 # slsk
|
||||
];
|
||||
#nat.externalInterface = [ "wlp4s0" ];
|
||||
};
|
||||
|
||||
users.users.${config.main-user}.extraGroups = [ "docker" ];
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||
v4l2loopback
|
||||
];
|
||||
boot.extraModprobeConfig = ''
|
||||
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
|
||||
'';
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
services.blueman.enable = true;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
# zfs:
|
||||
# sudo zfs create -o mountpoint=legacy -o canmount=off -o atime=off -o compression=zstd -o sync=disabled -o casesensitivity=sensitive -o exec=on -o setuid=off -o xattr=sa -o devices=off pool/games
|
||||
# sudo zfs create -o mountpoint=legacy -o canmount=off -o atime=off -o compression=zstd -o sync=disabled -o casesensitivity=sensitive -o exec=on -o setuid=off -o xattr=sa -o devices=off pool/torrents
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
|
@ -13,6 +13,11 @@
|
|||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
networking.hostId = "fd4421b3";
|
||||
systemd.services.zfs-mount.enable = false;
|
||||
services.zfs.autoScrub.enable = true;
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/c9cb1730-c0d1-4a2e-a092-12dfa7098476";
|
||||
fsType = "ext4";
|
||||
|
@ -23,6 +28,21 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/pool/games" = {
|
||||
fsType = "zfs";
|
||||
device = "pool/games";
|
||||
};
|
||||
|
||||
fileSystems."/pool/torrents" = {
|
||||
fsType = "zfs";
|
||||
device = "pool/torrents";
|
||||
};
|
||||
|
||||
fileSystems."/pool/music" = {
|
||||
fsType = "zfs";
|
||||
device = "pool/music";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
|
|
@ -1,18 +1,22 @@
|
|||
{ pkgs, ... }: {
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
hardware.opengl = {
|
||||
environment.variables = {
|
||||
VDPAU_DRIVER = "radeonsi";
|
||||
QT_MEDIA_BACKED = "gstreamer"; # ffmpeg can't choose between vdpau and vaapi for some reason
|
||||
};
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
#driSupport = true;
|
||||
enable32Bit = true;
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
rocm-opencl-icd
|
||||
amdvlk
|
||||
];
|
||||
|
||||
extraPackages32 = with pkgs; [
|
||||
driversi686Linux.amdvlk
|
||||
extraPackages32 = with pkgs.driversi686Linux; [
|
||||
amdvlk
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ impurity, ... }: {
|
||||
hyprland-session = {
|
||||
prerun = "export WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card2";
|
||||
prerun = "export AQ_DRM_DEVICES=/dev/dri/card1:/dev/dri/card2";
|
||||
extraConfig = "source = ${impurity.link ./hyprland.conf}";
|
||||
extraConfigStatic = "source = ${./hyprland.conf}";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,4 +21,7 @@ workspace = 16, monitor:eDP-1
|
|||
workspace = 17, monitor:eDP-1
|
||||
workspace = 18, monitor:eDP-1
|
||||
workspace = 19, monitor:eDP-1
|
||||
workspace = 20, monitor:eDP-1
|
||||
workspace = 20, monitor:eDP-1
|
||||
|
||||
workspace = name:lock_DP-1, monitor:DP-1
|
||||
workspace = name:lock_eDP-1, monitor:eDP-1
|
Loading…
Reference in a new issue