feat: switch to plasma because gnome bad
This commit is contained in:
parent
a86323baaa
commit
2dfa73e0cf
12
flake.lock
12
flake.lock
@ -90,11 +90,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1611544074,
|
"lastModified": 1611611233,
|
||||||
"narHash": "sha256-wa+TRNehoT187YFOejXqHMZMhVjBbYZGF0EWYfGqbJI=",
|
"narHash": "sha256-xDAvVVvHbQ3Sf+Q5GVNbiYFZ2PDwtCoeAFRytCZNq30=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "aa8868c7cca8d30706a68a876d048968c83e1cf1",
|
"rev": "fa0eac3dff5757f6ca106d7325db6c75d22f7e5e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -115,11 +115,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1611605212,
|
"lastModified": 1611666253,
|
||||||
"narHash": "sha256-JZGt4FgYcH/iXtn4jepRjX8CzZaGa1RZkCj6l5C9/ZE=",
|
"narHash": "sha256-YdDc66rBJ62u3oZTdZWxtFcppfC50B36/g3+tSwKxgM=",
|
||||||
"owner": "colemickens",
|
"owner": "colemickens",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "74afaa2b0886d2d40f5f21dc06a58c44ec1add57",
|
"rev": "e492f1af4e7c7550a1454feaec59a296dcce35be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -166,7 +166,7 @@ in
|
|||||||
services.xserver = {
|
services.xserver = {
|
||||||
videoDrivers = [ "amdgpu" ];
|
videoDrivers = [ "amdgpu" ];
|
||||||
};
|
};
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.podman.enable = true;
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = false;
|
enable = false;
|
||||||
enableTCPIP = true;
|
enableTCPIP = true;
|
||||||
|
@ -1,10 +1,24 @@
|
|||||||
{
|
{
|
||||||
imports = [ ./dns ];
|
imports = [ ./dns ];
|
||||||
|
|
||||||
|
networking.networkmanager.enable = false;
|
||||||
|
networking.dhcpcd.enable = true;
|
||||||
networking.useDHCP = false;
|
networking.useDHCP = false;
|
||||||
|
|
||||||
networking.dhcpcd.extraConfig = ''
|
networking.dhcpcd.extraConfig = ''
|
||||||
noarp
|
noarp
|
||||||
nodelay
|
nodelay
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
/*systemd.network = {
|
||||||
|
enable = true;
|
||||||
|
networks = {
|
||||||
|
internet0 = {
|
||||||
|
matchConfig = { Name = "enp6s0"; };
|
||||||
|
networkConfig = {
|
||||||
|
Address = "192.168.1.33";
|
||||||
|
Gateway = "192.168.1.255";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};*/
|
||||||
}
|
}
|
||||||
|
@ -31,5 +31,5 @@
|
|||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8000 8448 ];
|
# networking.firewall.allowedTCPPorts = [ 8000 8448 ];
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
home = "/home/patriot";
|
home = "/home/patriot";
|
||||||
extraGroups = [ "wheel" "adbusers" "dialout" "docker" ];
|
extraGroups = [ "wheel" "adbusers" "dialout" ];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
hashedPassword =
|
hashedPassword =
|
||||||
"$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
|
"$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
|
||||||
@ -30,15 +30,47 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
security.pam.services.patriot.enableGnomeKeyring = true;
|
security.pam.services.patriot = {
|
||||||
|
enableGnomeKeyring = true;
|
||||||
|
enableKwallet = false;
|
||||||
|
};
|
||||||
services = {
|
services = {
|
||||||
gnome3 = {
|
gnome3 = {
|
||||||
gnome-keyring.enable = true;
|
gnome-keyring.enable = true;
|
||||||
};
|
};
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
desktopManager.gnome3.enable = true;
|
desktopManager = {
|
||||||
displayManager.gdm.enable = true;
|
plasma5.enable = true;
|
||||||
|
gnome3.enable = false;
|
||||||
|
xterm.enable = false;
|
||||||
|
};
|
||||||
|
displayManager = {
|
||||||
|
autoLogin = {
|
||||||
|
enable = true;
|
||||||
|
user = "patriot";
|
||||||
|
};
|
||||||
|
lightdm.enable = false;
|
||||||
|
gdm = {
|
||||||
|
enable = false;
|
||||||
|
wayland = true;
|
||||||
|
};
|
||||||
|
sddm.enable = true;
|
||||||
|
startx.enable = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.user.services.gnome-session-restart-dbus.serviceConfig = {
|
||||||
|
Slice = "-.slice";
|
||||||
|
};
|
||||||
|
systemd = {
|
||||||
|
targets = {
|
||||||
|
network-online.enable = false;
|
||||||
|
};
|
||||||
|
services = {
|
||||||
|
systemd-networkd-wait-online.enable = false;
|
||||||
|
NetworkManager-wait-online.enable = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -213,7 +213,7 @@ in
|
|||||||
font-awesome
|
font-awesome
|
||||||
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
||||||
# Programs
|
# Programs
|
||||||
gnome3.gnome-tweaks
|
latte-dock
|
||||||
gnome3.seahorse
|
gnome3.seahorse
|
||||||
wine-staging
|
wine-staging
|
||||||
cachix
|
cachix
|
||||||
@ -228,7 +228,7 @@ in
|
|||||||
youtube-dl
|
youtube-dl
|
||||||
ffmpeg
|
ffmpeg
|
||||||
mupdf
|
mupdf
|
||||||
transmission-gtk
|
transmission-qt
|
||||||
gitAndTools.gh
|
gitAndTools.gh
|
||||||
steam-run
|
steam-run
|
||||||
lutris
|
lutris
|
||||||
@ -464,23 +464,23 @@ in
|
|||||||
dotDir = ".config/zsh";
|
dotDir = ".config/zsh";
|
||||||
history.path = ".local/share/zsh/history";
|
history.path = ".local/share/zsh/history";
|
||||||
envExtra = ''
|
envExtra = ''
|
||||||
export SDL_VIDEODRIVER=wayland
|
#export SDL_VIDEODRIVER=wayland
|
||||||
# needs qt5.qtwayland in systemPackages
|
# needs qt5.qtwayland in systemPackages
|
||||||
export QT_QPA_PLATFORM=wayland
|
#export QT_QPA_PLATFORM=wayland
|
||||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
#export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||||
# use this if they aren't displayed properly:
|
# use this if they aren't displayed properly:
|
||||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
#export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
'';
|
'';
|
||||||
# loginExtra =
|
/*loginExtra =
|
||||||
# let
|
let
|
||||||
#deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
|
#deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
|
||||||
# in
|
in
|
||||||
# ''
|
''
|
||||||
# if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
||||||
# exec ${pkgBin deCmd}
|
exec startplasma-x11
|
||||||
# fi
|
fi
|
||||||
# '';
|
'';*/
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
bindkey "$terminfo[kRIT5]" forward-word
|
bindkey "$terminfo[kRIT5]" forward-word
|
||||||
bindkey "$terminfo[kLFT5]" backward-word
|
bindkey "$terminfo[kLFT5]" backward-word
|
||||||
@ -748,7 +748,7 @@ in
|
|||||||
maxCacheTtl = 3600 * 24;
|
maxCacheTtl = 3600 * 24;
|
||||||
maxCacheTtlSsh = maxCacheTtl;
|
maxCacheTtlSsh = maxCacheTtl;
|
||||||
grabKeyboardAndMouse = false;
|
grabKeyboardAndMouse = false;
|
||||||
pinentryFlavor = "gnome3";
|
pinentryFlavor = "qt";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user