treewide: prune out xorg
This commit is contained in:
parent
b89253931d
commit
46c30b9d5d
GPG key ID:
6500251E087653C9
16 changed files with 1 additions and 205 deletions
|
|
@ -20,7 +20,6 @@
|
|||
ccache
|
||||
corectrl
|
||||
flatpak
|
||||
#greetd_xorg
|
||||
greetd_wayland
|
||||
gui
|
||||
input
|
||||
|
|
@ -39,7 +38,6 @@
|
|||
./networking.nix
|
||||
./packages.nix
|
||||
|
||||
#../../users/rin/xorg.nix
|
||||
../../users/rin/wayland.nix
|
||||
];
|
||||
services.postgresql.ensureDatabases = [ "barista" "barista-dev" ];
|
||||
|
|
|
|||
|
|
@ -13,12 +13,4 @@
|
|||
];
|
||||
kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava);
|
||||
};
|
||||
services.xserver.xrandrHeads = [{
|
||||
output = "DP-1";
|
||||
primary = true;
|
||||
monitorConfig = ''
|
||||
Modeline "2560x1440_144.00" 808.75 2560 2792 3072 3584 1440 1443 1448 1568 -hsync +vsync
|
||||
Option "PreferredMode" "2560x1440_144.00"
|
||||
'';
|
||||
}];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ in {
|
|||
./system/corectrl.nix
|
||||
./system/flatpak.nix
|
||||
./system/greetd_wayland.nix
|
||||
./system/greetd_xorg.nix
|
||||
./system/gui.nix
|
||||
./system/home-manager.nix
|
||||
./system/input.nix
|
||||
|
|
@ -54,7 +53,6 @@ in {
|
|||
./user/direnv.nix
|
||||
./user/dunst.nix
|
||||
./user/eww.nix
|
||||
./user/eww-wayland.nix
|
||||
./user/git.nix
|
||||
./user/gpg.nix
|
||||
./user/hypridle.nix
|
||||
|
|
@ -70,13 +68,11 @@ in {
|
|||
./user/picom.nix
|
||||
./user/polybar.nix
|
||||
./user/rofi.nix
|
||||
./user/rofi-wayland.nix
|
||||
./user/sessionVariables.nix
|
||||
./user/spicetify.nix
|
||||
./user/sxhkd.nix
|
||||
./user/theming.nix
|
||||
./user/xdg.nix
|
||||
./user/xorg.nix
|
||||
./user/zsh.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -15,9 +15,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
autorun = false;
|
||||
displayManager.startx.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
autorun = false;
|
||||
displayManager.startx.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,12 +8,5 @@
|
|||
};
|
||||
xkb.options = "caps:escape";
|
||||
};
|
||||
services.libinput = {
|
||||
enable = true;
|
||||
mouse = {
|
||||
accelSpeed = "0";
|
||||
accelProfile = "flat";
|
||||
};
|
||||
};
|
||||
console.useXkbConfig = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
# Depends on bspwm
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ xtitle ];
|
||||
programs.eww = {
|
||||
enable = true;
|
||||
configDir = ../../res/eww;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{ config, inputs, ... }: {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
theme = "theme";
|
||||
};
|
||||
xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi;
|
||||
}
|
||||
|
|
@ -22,7 +22,6 @@
|
|||
NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
|
||||
PUB_CACHE = "${config.xdg.cacheHome}/dart";
|
||||
WGETRC = "${config.xdg.configHome}/wgetrc";
|
||||
XINITRC = "${config.xdg.configHome}/xorg/xinitrc";
|
||||
|
||||
WINEPREFIX = "${config.xdg.dataHome}/wine64";
|
||||
WINEARCH = "win64";
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
{ config, ... }: {
|
||||
|
||||
xsession = {
|
||||
enable = true;
|
||||
profilePath = ".config/xorg/xprofile";
|
||||
scriptPath = ".config/xorg/xsession";
|
||||
};
|
||||
|
||||
xdg.configFile."xorg/xinitrc".source = ../../scripts/xinitrc;
|
||||
xresources = {
|
||||
path = "${config.xdg.configHome}/xorg/xresources";
|
||||
properties = {
|
||||
# special
|
||||
"*.foreground" = "#c5c8c6";
|
||||
"*.background" = "#1d1f21";
|
||||
"*.cursorColor" = "#c5c8c6";
|
||||
|
||||
# black
|
||||
"*.color0" = "#1d1f21";
|
||||
"*.color8" = "#969896";
|
||||
|
||||
# red
|
||||
"*.color1" = "#cc342b";
|
||||
"*.color9" = "#cc342b";
|
||||
|
||||
# green
|
||||
"*.color2" = "#198844";
|
||||
"*.color10" = "#198844";
|
||||
|
||||
# yellow
|
||||
"*.color3" = "#fba922";
|
||||
"*.color11" = "#fba922";
|
||||
|
||||
# blue
|
||||
"*.color4" = "#3971ed";
|
||||
"*.color12" = "#3971ed";
|
||||
|
||||
# magenta
|
||||
"*.color5" = "#a36ac7";
|
||||
"*.color13" = "#a36ac7";
|
||||
|
||||
# cyan
|
||||
"*.color6" = "#3971ed";
|
||||
"*.color14" = "#3971ed";
|
||||
|
||||
# white
|
||||
"*.color7" = "#c5c8c6";
|
||||
"*.color15" = "#ffffff";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -7,5 +7,4 @@ builtins.map (path: import path) [
|
|||
./rofi.nix
|
||||
./steam.nix
|
||||
./utillinux.nix
|
||||
./xinit.nix
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/startx.cpp b/startx.cpp
|
||||
index 125c398..296b29f 100644
|
||||
--- a/startx.cpp
|
||||
+++ b/startx.cpp
|
||||
@@ -270,7 +270,7 @@ if [ x"$enable_xauth" = x1 ] ; then
|
||||
dummy=0
|
||||
|
||||
XCOMM create a file with auth information for the server. ':0' is a dummy.
|
||||
- xserverauthfile=$HOME/.serverauth.$$
|
||||
+ xserverauthfile=$XAUTHORITY
|
||||
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM
|
||||
xauth -q -f "$xserverauthfile" << EOF
|
||||
add :$dummy . $mcookie
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
self: super: {
|
||||
xorg = super.xorg // {
|
||||
xinit = super.xorg.xinit.overrideAttrs (old: {
|
||||
# Some info:
|
||||
# - Make startx use $XAUTHORITY as server auth files instead of .serverauth.$$
|
||||
# - Make startx respect $XINITRC and $XSERVERRC
|
||||
patches = (old.patches or []) ++ [ ./patches/startx.patch ];
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
|
||||
eval $(dbus-launch --exit-with-session --sh-syntax)
|
||||
fi
|
||||
systemctl --user import-environment DISPLAY XAUTHORITY
|
||||
|
||||
if command -v dbus-update-activation-environment > /dev/null 2>&1; then
|
||||
dbus-update-activation-environment DISPLAY XAUTHORITY
|
||||
fi
|
||||
|
||||
xrdb ${XDG_CONFIG_HOME}/xorg/xresources
|
||||
exec ${XDG_CONFIG_HOME}/xorg/xsession
|
||||
|
|
@ -58,8 +58,6 @@ in {
|
|||
vesktop
|
||||
virt-manager
|
||||
winetricks
|
||||
xclip
|
||||
xorg.xgamma
|
||||
zathura
|
||||
zenity
|
||||
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
{ config, lib, modules, pkgs, ... }: {
|
||||
programs.zsh.enable = true;
|
||||
users.users.rin = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ];
|
||||
shell = pkgs.zsh;
|
||||
uid = 1001;
|
||||
hashedPasswordFile = config.age.secrets.passwd.path;
|
||||
};
|
||||
home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: {
|
||||
home = {
|
||||
username = "rin";
|
||||
homeDirectory = "/home/rin";
|
||||
stateVersion = "21.05";
|
||||
keyboard = null; # see https://github.com/nix-community/home-manager/issues/2219
|
||||
};
|
||||
|
||||
imports = with modules.user; [
|
||||
./packages.nix
|
||||
sessionVariables
|
||||
|
||||
catppuccin
|
||||
direnv
|
||||
git
|
||||
gpg
|
||||
neovim
|
||||
npm
|
||||
pass
|
||||
zsh
|
||||
] ++ lib.optionals enableGUI [
|
||||
theming
|
||||
xdg
|
||||
|
||||
kitty
|
||||
mpv
|
||||
obs
|
||||
rofi
|
||||
|
||||
picom
|
||||
bspwm
|
||||
sxhkd
|
||||
xorg
|
||||
dunst
|
||||
eww
|
||||
];
|
||||
|
||||
services.mpris-proxy.enable = true;
|
||||
|
||||
home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl {
|
||||
url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe";
|
||||
sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns";
|
||||
};
|
||||
home.file.".local/bin/osu" = {
|
||||
executable = true;
|
||||
source = ../../scripts/osu;
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue