gebner/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

archachatina: switch to i3

Browse Source
This commit is contained in:
Gabriel Ebner 2020-11-26 17:58:22 +01:00
parent ec0eb1930b
commit 73a9f4660f
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archachatina.nix
View File

@ -4,12 +4,12 @@
imports = imports =
[ [
./common-headless.nix ./common-headless.nix
./sway.nix # ./sway.nix
# ./i3.nix ./i3.nix
./large-sw.nix ./large-sw.nix
./uefi.nix ./uefi.nix
./fstrim.nix ./fstrim.nix
./qemu-user.nix # ./qemu-user.nix
./atmega.nix ./atmega.nix
./v4l2loopback.nix ./v4l2loopback.nix
./huion.nix ./huion.nix
@ -103,7 +103,7 @@
#boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest; #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
# boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_8; # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_8;
services.xserver = { services.xserver = {
videoDrivers = [ "amdgpu" ]; videoDrivers = [ "amdgpu" ];

8
common-gui.nix
View File

@ -54,6 +54,14 @@
]; ];
}; };
environment.systemPackages = [
(pkgs.writeScriptBin "gsd-xsettings"
''
#!/bin/sh
exec ${pkgs.gnome3.gnome-settings-daemon}/libexec/gsd-xsettings "$@"
'')
];
# prevent satanic torture # prevent satanic torture
programs.qt5ct.enable = true; programs.qt5ct.enable = true;

1
common-headless.nix
View File

@ -16,6 +16,7 @@
nix.extraOptions = '' nix.extraOptions = ''
auto-optimise-store = true auto-optimise-store = true
binary-caches-parallel-connections = 10 binary-caches-parallel-connections = 10
experimental-features = flakes nix-command
''; '';
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

6
i3.nix
View File

@ -20,7 +20,7 @@
evince evince
arandr arandr
xss-lock i3lock i3lock-color xss-lock i3lock i3lock-color
# xdotool xdotool
scrot scrot
pavucontrol pavucontrol
dconf-editor dconf-editor
@ -59,9 +59,6 @@
export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
export XDG_CURRENT_DESKTOP=X-Generic export XDG_CURRENT_DESKTOP=X-Generic
for m in xsettings; do
${pkgs.gnome3.gnome_settings_daemon}/libexec/gsd-$m &
done
i3 & i3 &
waitPID=$! waitPID=$!
''; '';
@ -75,6 +72,7 @@
xkbOptions = "caps:ctrl_modifier"; xkbOptions = "caps:ctrl_modifier";
}; };
services.dbus.socketActivated = true;
services.dbus.packages = with pkgs; [ dunst ]; services.dbus.packages = with pkgs; [ dunst ];
} }

6
sway.nix
View File

@ -35,12 +35,6 @@
qt5.qtwayland qt5.qtwayland
wdisplays wdisplays
(pkgs.writeScriptBin "gsd-xsettings"
''
#!/bin/sh
exec ${pkgs.gnome3.gnome-settings-daemon}/libexec/gsd-xsettings "$@"
'')
]; ];
nixpkgs.config.packageOverrides = pkgs: with pkgs; { nixpkgs.config.packageOverrides = pkgs: with pkgs; {