sway on nvidia + ironbar
This commit is contained in:
parent
362d12714c
commit
481e682fbf
16 changed files with 830 additions and 655 deletions
|
@ -13,9 +13,13 @@
|
|||
inputs.nur.overlay
|
||||
outputs.overlays.additions
|
||||
outputs.overlays.pkg-sets
|
||||
outputs.overlays.podman-stable
|
||||
outputs.overlays.wlroots
|
||||
outputs.overlays.sway-unwrapped
|
||||
outputs.overlays.sway
|
||||
inputs.nix-rice.overlays.default
|
||||
outputs.overlays.rice
|
||||
inputs.helix.overlays.default
|
||||
# inputs.eww.overlays.default
|
||||
];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
|
@ -26,28 +30,19 @@
|
|||
nix = {
|
||||
registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
|
||||
settings = {
|
||||
substituters = ["https://hyprland.cachix.org"];
|
||||
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
|
||||
experimental-features = "nix-command flakes";
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
inputs.hyprland.nixosModules.default
|
||||
# inputs.declarative-cachix.nixosModules.declarative-cachix
|
||||
# inputs.helix
|
||||
];
|
||||
|
||||
# cachix = [
|
||||
# "nix-community"
|
||||
# ];
|
||||
|
||||
nix.extraOptions = ''
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
'';
|
||||
|
||||
systemd.services.NetworkManager-wait-online.enable = true; # for some reason nm doesn't enable without this lel
|
||||
systemd.services.NetworkManager-wait-online.enable = true; # for some reason nm doesn't enable without this
|
||||
|
||||
environment.pathsToLink = ["/share/zsh"];
|
||||
|
||||
|
@ -81,52 +76,14 @@
|
|||
services.xserver.xkbOptions = "caps:escape";
|
||||
services.xserver.layout = "us";
|
||||
services.xserver.libinput.enable = true;
|
||||
services.xserver.displayManager.lightdm.enable = false; # gets installed by default..
|
||||
|
||||
services.udisks2.enable = true;
|
||||
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland = {
|
||||
enable = true;
|
||||
hidpi = false;
|
||||
};
|
||||
nvidiaPatches = true;
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"hyprland_login" = with pkgs.rice; {
|
||||
enable = true;
|
||||
text = ''
|
||||
misc {
|
||||
disable_hyprland_logo=true
|
||||
disable_splash_rendering=true
|
||||
}
|
||||
monitor=,highrr,auto,1
|
||||
windowrule=fullscreen,^(gtkgreet)$
|
||||
windowrule=dimaround,^(gtkgreet)$
|
||||
bind=SUPER,Return,exec,${lib.getExe pkgs.greetd.gtkgreet}
|
||||
bind=,Escape,exec,wlogout
|
||||
bind=SUPER_SHIFT,e,exec,wlogout
|
||||
env = GTK_THEME,nix-rice
|
||||
exec = swaybg -i ${bg.image} -m fill
|
||||
exec = ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
|
||||
exec = gsettings set org.gnome.desktop.interface gtk-theme '${gtk-theme.name}'
|
||||
exec = gsettings set org.gnome.desktop.interface font-name '${fonts.sans.name}'
|
||||
exec = gsettings set org.gnome.desktop.interface icon-theme '${icons.name}'
|
||||
exec = ${lib.getExe pkgs.greetd.gtkgreet} -l -c "dbus-run-session Hyprland" -s "${gtk-theme.package}/share/themes/nix-rice/gtk-3.0/gtk.css"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions";
|
||||
# command = "${lib.getExe pkgs.hyprland} -c /etc/hyprland_login";
|
||||
# command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.hyprland} -c /etc/hyprland_login";
|
||||
command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --sessions ${pkgs.sway}/share/wayland-sessions -c 'sway --unsupported-gpu'";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
|
@ -165,19 +122,6 @@
|
|||
qt.style = "gtk2";
|
||||
|
||||
programs.zsh.enable = true;
|
||||
programs.xonsh = {
|
||||
enable = true;
|
||||
config =
|
||||
builtins.replaceStrings
|
||||
["#NEWPATHS"]
|
||||
[
|
||||
''
|
||||
'${pkgs.xonsh}/lib/python3.10/site-packages',
|
||||
'${pkgs.python310Packages.pip}/lib/python3.10/site-packages'
|
||||
''
|
||||
]
|
||||
(builtins.readFile ../home/dots/xonshrc);
|
||||
};
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
|
||||
services.tumbler.enable = true; # thumbnailer for thunar
|
||||
|
@ -219,24 +163,19 @@
|
|||
programs.nix-index.enableZshIntegration = false;
|
||||
programs.nix-index.enableBashIntegration = false;
|
||||
|
||||
# services.mullvad-vpn.enable = true;
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
mullvad = {
|
||||
address = ["10.67.227.64/32"];
|
||||
dns = ["10.64.0.1"];
|
||||
privateKey = "OOPAlePjy7x2DVpg6d7BoBqpST3lDJSYght185tSUl8=";
|
||||
peers = [
|
||||
{
|
||||
publicKey = "LXuRwa9JRTt2/UtldklKGlj/IVLORITqgET4II4DRkU=";
|
||||
allowedIPs = ["0.0.0.0/0"];
|
||||
endpoint = "146.70.200.194:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
programs.sway = {
|
||||
# to use home-manager
|
||||
package = null;
|
||||
enable = true;
|
||||
wrapperFeatures = {
|
||||
base = true;
|
||||
gtk = true;
|
||||
};
|
||||
# extraPackages = with pkgs; [swaylock swayidle foot dmenu vulkan-validation-layers];
|
||||
};
|
||||
|
||||
services.mullvad-vpn.enable = true;
|
||||
|
||||
networking.firewall.enable = true;
|
||||
networking.firewall = {
|
||||
trustedInterfaces = ["tailscale0"];
|
||||
|
@ -260,5 +199,5 @@
|
|||
'';
|
||||
};
|
||||
|
||||
system.stateVersion = "23.05"; # Did you read the comment? # lol no
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
}
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbcore" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd" "i2c-dev"];
|
||||
boot.extraModulePackages = [pkgs.linuxPackages_xanmod_latest.system76-scheduler];
|
||||
boot.kernelParams = [
|
||||
"nvidia_drm.modeset=1"
|
||||
"mitigations=off"
|
||||
|
@ -45,6 +44,7 @@
|
|||
environment.sessionVariables = rec {
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5";
|
||||
WLR_NO_HARDWARE_CURSORS = "1";
|
||||
# WLR_RENDERER = "vulkan";
|
||||
GBM_BACKEND = "nvidia-drm";
|
||||
NVD_BACKEND = "direct";
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
|
@ -56,7 +56,6 @@
|
|||
|
||||
virtualisation = {
|
||||
podman = {
|
||||
# package = pkgs.podman-stable;
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
|
@ -87,18 +86,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
services.dbus.packages = [
|
||||
pkgs.linuxPackages_xanmod_latest.system76-scheduler
|
||||
];
|
||||
|
||||
systemd.packages = [
|
||||
pkgs.linuxPackages_xanmod_latest.system76-scheduler
|
||||
];
|
||||
|
||||
environment.etc = {
|
||||
"system76-scheduler".source = "${pkgs.linuxPackages_xanmod_latest.system76-scheduler}/etc/system76-scheduler";
|
||||
};
|
||||
|
||||
services.hardware.openrgb = {
|
||||
enable = true;
|
||||
motherboard = "amd";
|
||||
|
@ -112,7 +99,6 @@
|
|||
wl-clipboard
|
||||
wl-clipboard-x11
|
||||
xclip
|
||||
# system76-scheduler
|
||||
];
|
||||
|
||||
networking.hostName = "quiver"; # Define your hostname.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue