merge
This commit is contained in:
parent
755392bdb8
commit
27511925f3
22 changed files with 198 additions and 1650 deletions
|
|
@ -1,51 +0,0 @@
|
|||
{ config, ... }:
|
||||
let
|
||||
username = config.conf.username;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../../modules
|
||||
];
|
||||
wayland.windowManager.hyprland.settings.monitor = [
|
||||
# default
|
||||
"DP-2,2560x1440@165,0x0,1"
|
||||
"DP-1,3440x1440@180,2560x0,1,vrr,1"
|
||||
"HDMI-A-1,1920x1200@60,6000x0,1"
|
||||
"HDMI-A-1,transform,1"
|
||||
|
||||
# all others
|
||||
",highrr,auto,1"
|
||||
];
|
||||
wayland.windowManager.hyprland.settings.workspace = [
|
||||
# workspaces
|
||||
# monitor middle
|
||||
"2,monitor:DP-1, default:true"
|
||||
"4,monitor:DP-1"
|
||||
"6,monitor:DP-1"
|
||||
"8,monitor:DP-1"
|
||||
"9,monitor:DP-1"
|
||||
"10,monitor:DP-1"
|
||||
|
||||
# monitor left
|
||||
"1,monitor:DP-2, default:true"
|
||||
"5,monitor:DP-2"
|
||||
"7,monitor:DP-2"
|
||||
|
||||
# monitor right
|
||||
"3,monitor:HDMI-A-1, default:true"
|
||||
];
|
||||
conf.monitor = "DP-1";
|
||||
programs.hyprland.hyprpaper = ''
|
||||
#load
|
||||
preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
|
||||
preload = /home/${username}/Pictures/backgrounds/shino_wide.png
|
||||
preload = /home/${username}/Pictures/backgrounds/shinobu_1200.jpg
|
||||
|
||||
#set
|
||||
wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
|
||||
wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
|
||||
wallpaper = HDMI-A-1,/home/${username}/Pictures/backgrounds/shinobu_1200.jpg
|
||||
splash = true
|
||||
'';
|
||||
programs.hyprland.extra_autostart = [ "streamdeck -n" ];
|
||||
}
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{ config, ... }:
|
||||
let
|
||||
username = config.conf.username;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../../modules/conf.nix
|
||||
|
|
@ -12,28 +15,48 @@
|
|||
};
|
||||
streamdeck.enable = true;
|
||||
hostname = "spaceship";
|
||||
};
|
||||
hyprland = {
|
||||
monitor = [
|
||||
# default
|
||||
"DP-2,2560x1440@165,0x0,1"
|
||||
"DP-1,3440x1440@180,2560x0,1,vrr,1"
|
||||
"HDMI-A-1,1920x1200@60,6000x0,1"
|
||||
"HDMI-A-1,transform,1"
|
||||
|
||||
virtualisation.virtualbox.host.enable = true;
|
||||
# all others
|
||||
",highrr,auto,1"
|
||||
];
|
||||
workspace = [
|
||||
# workspaces
|
||||
# monitor middle
|
||||
"2,monitor:DP-1, default:true"
|
||||
"4,monitor:DP-1"
|
||||
"6,monitor:DP-1"
|
||||
"8,monitor:DP-1"
|
||||
"9,monitor:DP-1"
|
||||
"10,monitor:DP-1"
|
||||
|
||||
# enable hardware acceleration and rocm
|
||||
hardware.xone.enable = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
rocmPackages.clr.icd
|
||||
rocm-opencl-runtime
|
||||
];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = lib.mkDefault true;
|
||||
};
|
||||
networking.firewall = {
|
||||
allowedTCPPortRanges = [
|
||||
{ from = 1714; to = 1764; } # KDE Connect
|
||||
];
|
||||
allowedUDPPortRanges = [
|
||||
{ from = 1714; to = 1764; } # KDE Connect
|
||||
];
|
||||
# monitor left
|
||||
"1,monitor:DP-2, default:true"
|
||||
"5,monitor:DP-2"
|
||||
"7,monitor:DP-2"
|
||||
|
||||
# monitor right
|
||||
"3,monitor:HDMI-A-1, default:true"
|
||||
];
|
||||
hyprpaper = ''
|
||||
#load
|
||||
preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
|
||||
preload = /home/${username}/Pictures/backgrounds/shino_wide.png
|
||||
preload = /home/${username}/Pictures/backgrounds/shinobu_1200.jpg
|
||||
|
||||
#set
|
||||
wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
|
||||
wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
|
||||
wallpaper = HDMI-A-1,/home/${username}/Pictures/backgrounds/shinobu_1200.jpg
|
||||
splash = true
|
||||
'';
|
||||
extra_autostart = [ "streamdeck -n" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
./spaceship.nix
|
||||
./configuration.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, modulesPath, ... }:
|
||||
{ pkgs, config, lib, modulesPath, ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
|
|
@ -32,4 +32,29 @@
|
|||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
services.fstrim.enable = lib.mkDefault true;
|
||||
nix.settings.auto-optimise-store = true;
|
||||
|
||||
virtualisation.virtualbox.host.enable = true;
|
||||
|
||||
# enable hardware acceleration and rocm
|
||||
hardware.xone.enable = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
# DUDE FOR FUCK SAKE
|
||||
# TODO:
|
||||
# rocmPackages.clr.icd
|
||||
# rocm-opencl-runtime
|
||||
];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = lib.mkDefault true;
|
||||
};
|
||||
networking.firewall = {
|
||||
allowedTCPPortRanges = [
|
||||
{ from = 1714; to = 1764; } # KDE Connect
|
||||
];
|
||||
allowedUDPPortRanges = [
|
||||
{ from = 1714; to = 1764; } # KDE Connect
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue