diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 28a3b7f..756a894 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -36,6 +36,10 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
#readOnlyNixStore = false;
};
+ environment.sessionVariables = {
+ ZSH_DISABLE_COMPFIX = "true";
+ };
+
services.udev.extraRules = ''
#SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
# SDP protocol
@@ -73,12 +77,14 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
services = {
xserver = {
+ displayManager.gdm.enable = true;
+ displayManager.lightdm.enable = false;
enable = true;
updateDbusEnvironment = true;
- libinput.enable = true;
- layout = "us";
+ xkb.layout = "us";
wacom.enable = true;
};
+ libinput.enable = true;
openssh = {
enable = true;
@@ -185,7 +191,7 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
};
};
xdgOpenUsePortal = true;
- gtkUsePortal = true;
+ #gtkUsePortal = true; # deprecated
};
#sounds.enable = true;
@@ -195,7 +201,7 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
#autostart.enable = true;
};
fonts = {
- fonts = with pkgs; [
+ packages = with pkgs; [
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
noto-fonts-monochrome-emoji
];
diff --git a/host/Rory-desktop/ollama.nix b/host/Rory-desktop/ollama.nix
index 233ea1f..a302d1c 100755
--- a/host/Rory-desktop/ollama.nix
+++ b/host/Rory-desktop/ollama.nix
@@ -4,19 +4,19 @@
# systemd.tmpfiles.rules = [ "d /data/ollama 0750 ostgres postgres" ];
#overlays
- nixpkgs.overlays = [
- (final: old: {
- rocmPackages = old.rocmPackages // {
- rocblas = (old.rocmPackages.rocblas.overrideAttrs (oldAttrs: {
- gpuTargets = [ "gfx1102" ];
- }));
- };
- }
- )
- ];
+ #nixpkgs.overlays = [
+ # (final: old: {
+ # rocmPackages = old.rocmPackages // {
+ # rocblas = (old.rocmPackages.rocblas.overrideAttrs (oldAttrs: {
+ # gpuTargets = [ "gfx1102" ];
+ # }));
+ # };
+ # }
+ # )
+ #];
services.ollama = {
- enable = true;
+ enable = false;
home = "/data/ollama/home";
models = "/data/ollama/home/models";
environmentVariables = {
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/wayland.nix
index c923007..74cb192 100644
--- a/host/Rory-desktop/optional/gui/wayland.nix
+++ b/host/Rory-desktop/optional/gui/wayland.nix
@@ -34,6 +34,8 @@
wl-clipboard
grim
slurp
+ easyeffects
+ keepassxc
];
};
diff --git a/host/Rory-desktop/optional/gui/x11.nix b/host/Rory-desktop/optional/gui/x11.nix
index 4bf9fe4..0f55862 100644
--- a/host/Rory-desktop/optional/gui/x11.nix
+++ b/host/Rory-desktop/optional/gui/x11.nix
@@ -13,13 +13,18 @@
xrandr --output HDMI-1 --mode 3840x2160 --pos 0x0 --rotate normal --primary --output DP-1 --mode 1920x1080 --pos 3840x1080 --rotate normal --output HDMI-2 --off --output DP-2 --off
${pkgs.polybarFull}/bin/polybar &
${pkgs.dunst}/bin/dunst &
+ ${pkgs.picom}/bin/picom --config ~/.config/picom.conf &
${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${../../../../modules/users/Rory/wallpaper.webp}
'';
+ windowManager.i3.extraPackages = with pkgs; [
+ easyeffects
+ keepassxc
+ ];
};
- picom.enable = true;
- picom.vSync = false;
- picom.backend = "glx";
+ picom.enable = false;
+ #picom.vSync = false;
+ #picom.backend = "glx";
};
}
diff --git a/host/Rory-desktop/optional/hardware-specific/amd.nix b/host/Rory-desktop/optional/hardware-specific/amd.nix
index d44766a..45bea66 100644
--- a/host/Rory-desktop/optional/hardware-specific/amd.nix
+++ b/host/Rory-desktop/optional/hardware-specific/amd.nix
@@ -21,10 +21,9 @@ boot.initrd.kernelModules = [ "amdgpu" ];
];
hardware = {
- opengl = {
+ graphics = {
enable = true;
- driSupport = true;
- driSupport32Bit = true;
+ enable32Bit = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
amdvlk
diff --git a/host/Rory-desktop/optional/hardware-specific/nvidia.nix b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
index 7278d84..66b328f 100644
--- a/host/Rory-desktop/optional/hardware-specific/nvidia.nix
+++ b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
@@ -18,7 +18,7 @@
};
hardware = {
- opengl = {
+ graphics = {
enable = true;
driSupport = true;
driSupport32Bit = true;
diff --git a/host/Rory-devenv/software.nix b/host/Rory-devenv/software.nix
index 93b430e..63aed74 100755
--- a/host/Rory-devenv/software.nix
+++ b/host/Rory-devenv/software.nix
@@ -47,9 +47,9 @@
enable = true;
user = "Rory";
};
- libinput.enable = true;
videoDrivers = [ "qxl" ];
};
+ libinput.enable = true;
qemuGuest.enable = true;
spice-vdagentd.enable = true;
};
@@ -67,7 +67,7 @@
vscode-with-extensions
nodejs
];
- fonts.fonts = with pkgs; [
+ fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];
diff --git a/host/Rory-portable/configuration.nix b/host/Rory-portable/configuration.nix
index 579a655..6f49445 100644
--- a/host/Rory-portable/configuration.nix
+++ b/host/Rory-portable/configuration.nix
@@ -73,8 +73,7 @@
updateDbusEnvironment = true;
#videoDrivers = ["amdgpu"]; #"nvidia"
#desktopManager.gnome.enable = true;
- libinput.enable = true;
- layout = "us";
+ xkb.layout = "us";
windowManager.i3.enable = true;
windowManager.i3.extraSessionCommands = ''
# output from arandr:
@@ -85,6 +84,7 @@
${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${../../modules/users/Rory/wallpaper.webp}
'';
};
+ libinput.enable = true;
picom.enable = true;
picom.vSync = false;
picom.backend = "glx";
diff --git a/host/Rory-portable/optional/hardware-specific/amd.nix b/host/Rory-portable/optional/hardware-specific/amd.nix
index d44766a..e24bcd0 100644
--- a/host/Rory-portable/optional/hardware-specific/amd.nix
+++ b/host/Rory-portable/optional/hardware-specific/amd.nix
@@ -21,9 +21,9 @@ boot.initrd.kernelModules = [ "amdgpu" ];
];
hardware = {
- opengl = {
+ graphics = {
enable = true;
- driSupport = true;
+ #driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
diff --git a/host/Rory-portable/optional/hardware-specific/nvidia.nix b/host/Rory-portable/optional/hardware-specific/nvidia.nix
index 7278d84..66b328f 100644
--- a/host/Rory-portable/optional/hardware-specific/nvidia.nix
+++ b/host/Rory-portable/optional/hardware-specific/nvidia.nix
@@ -18,7 +18,7 @@
};
hardware = {
- opengl = {
+ graphics = {
enable = true;
driSupport = true;
driSupport32Bit = true;
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index 6f79c8f..3618ca7 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -42,10 +42,10 @@
enable = true;
videoDrivers = [ "intel" ];
desktopManager.gnome.enable = true;
- libinput.enable = true;
- layout = "us";
+ xkb.layout = "us";
modules = [ pkgs.xorg.xf86videointel ];
};
+ libinput.enable = true;
gnome = {
core-developer-tools.enable = false;
core-utilities.enable = false;
@@ -143,7 +143,7 @@
zsh-completions
];
- fonts.fonts = with pkgs; [
+ fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];
nix = {
|
