Merge branch 'desktop' into laptop
This commit is contained in:
commit
18297e60f2
GPG key ID:
A5767B54367CFBDF
31
flake.lock
31
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713818326,
|
||||
"narHash": "sha256-aw3xbVPJauLk/bbrlakIYxKpeuMWzA2feGrkIpIuXd8=",
|
||||
"lastModified": 1715486357,
|
||||
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "67de98ae6eed5ad6f91b1142356d71a87ba97f21",
|
||||
"rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -63,15 +63,16 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713819507,
|
||||
"narHash": "sha256-mG0kD8HmkCsHRkTBmqGb/QvM1vAvkAmB5p2H5XQ0zLo=",
|
||||
"lastModified": 1714837352,
|
||||
"narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "da839f20f1b1a57ec78d6b041f8d1369150d253e",
|
||||
"rev": "cba1ade848feac44b2eda677503900639581c3f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"ref": "v0.40.0",
|
||||
"repo": "Hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -138,11 +139,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713730424,
|
||||
"narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=",
|
||||
"lastModified": 1714755542,
|
||||
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06",
|
||||
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -153,11 +154,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1713714899,
|
||||
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
|
||||
"lastModified": 1715534503,
|
||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
|
||||
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -226,11 +227,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713724432,
|
||||
"narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=",
|
||||
"lastModified": 1714060055,
|
||||
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "9ace6f969ce495185df34cc6254fb9d297765478",
|
||||
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
};
|
||||
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
url = "github:hyprwm/Hyprland/v0.40.0";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -78,46 +78,7 @@
|
|||
pulseaudio
|
||||
qbittorrent
|
||||
tigervnc
|
||||
(vesktop.overrideAttrs (prev: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "wizardlink";
|
||||
repo = "Vesktop";
|
||||
rev = "93c9cc24f88c1dbc50c3ee0569ddbdbaec76d9b3";
|
||||
hash = "sha256-tJyiZ/gAh+mA/UoJq5rzjJxit8lZpkJC74lf1Z5eqFc=";
|
||||
};
|
||||
|
||||
installPhase =
|
||||
let
|
||||
# this is mainly required for venmic
|
||||
libPath = lib.makeLibraryPath (with pkgs; [
|
||||
libpulseaudio
|
||||
libnotify
|
||||
pipewire
|
||||
stdenv.cc.cc.lib
|
||||
libva
|
||||
]);
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt/Vesktop/resources
|
||||
cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources
|
||||
|
||||
pushd build
|
||||
${pkgs.libicns}/bin/icns2png -x icon.icns
|
||||
for file in icon_*x32.png; do
|
||||
file_suffix=''${file//icon_}
|
||||
install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png
|
||||
done
|
||||
|
||||
makeWrapper ${pkgs.electron}/bin/electron $out/bin/vesktop \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath} \
|
||||
--add-flags $out/opt/Vesktop/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}))
|
||||
vesktop
|
||||
vlc
|
||||
yt-dlp
|
||||
zathura
|
||||
|
|
@ -137,7 +98,7 @@
|
|||
dolphin-emu
|
||||
protontricks
|
||||
r2modman
|
||||
wineWowPackages.waylandFull
|
||||
wineWowPackages.stagingFull
|
||||
winetricks
|
||||
xonotic
|
||||
|
||||
|
|
@ -294,7 +255,7 @@
|
|||
enable = true;
|
||||
|
||||
theme = {
|
||||
name = "Catppuccin-Frappe-Lavender";
|
||||
name = "Catppuccin-Frappe-Standard-Lavender-Dark";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
accents = [ "lavender" ];
|
||||
tweaks = [ "rimless" ];
|
||||
|
|
@ -303,7 +264,7 @@
|
|||
};
|
||||
|
||||
iconTheme = {
|
||||
name = "Papirus";
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.catppuccin-papirus-folders.override {
|
||||
accent = "lavender";
|
||||
flavor = "frappe";
|
||||
|
|
@ -314,7 +275,7 @@
|
|||
# Configure QT
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "qtct";
|
||||
platformTheme.name = "qtct";
|
||||
};
|
||||
|
||||
# Configure XDG
|
||||
|
|
|
|||
19
nixos.nix
19
nixos.nix
|
|
@ -60,15 +60,13 @@
|
|||
};
|
||||
|
||||
networking.hostName = "nixos"; # Define your hostname.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# Enable WOL on my ethernet interface.
|
||||
networking.interfaces.enp5s0.wakeOnLan.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [ ];
|
||||
|
|
@ -99,7 +97,7 @@
|
|||
users.users.wizardlink = {
|
||||
createHome = true;
|
||||
description = "Alexandre Cavalheiro";
|
||||
extraGroups = [ "networkmanager" "wheel" "postgresql" "docker" ];
|
||||
extraGroups = [ "networkmanager" "wheel" "postgresql" "docker" "openrazer" ];
|
||||
|
||||
initialPassword = "wizardlink";
|
||||
isNormalUser = true;
|
||||
|
|
@ -176,6 +174,7 @@
|
|||
services.displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
|
||||
theme = "${import ./theming/sddm.nix { inherit pkgs; }}";
|
||||
};
|
||||
|
||||
|
|
@ -301,14 +300,12 @@
|
|||
## SERVICES #
|
||||
##
|
||||
|
||||
services.udev.extraRules = ''
|
||||
# Monsgeek M1
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0005", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
|
||||
'';
|
||||
|
||||
# Enable flatpak
|
||||
services.flatpak.enable = true;
|
||||
|
||||
# Enables VIA
|
||||
services.udev.packages = [ pkgs.via ];
|
||||
|
||||
# Enable and configure PostgreSQL.
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -250,6 +250,11 @@
|
|||
bind = $mainMod SHIFT, J, movewindow, d
|
||||
bindm = $mainMod, mouse:272, movewindow
|
||||
bindm = $mainMod, mouse:273, resizewindow
|
||||
|
||||
# Volume changes
|
||||
binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%+
|
||||
binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%-
|
||||
bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
|
||||
|
||||
# Window rules
|
||||
windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
export MANGOHUD=1
|
||||
|
||||
# https://docs.mesa3d.org/envvars.html
|
||||
export MESA_NO_DITHER=1 # Disables dither
|
||||
export MESA_BACK_BUFFER=pixmap # For X only
|
||||
|
||||
export DXVK_ASYNC=1
|
||||
|
||||
gamemoderun "$@"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
services.adguardhome = { enable = true; };
|
||||
}
|
||||
|
|
@ -15,5 +15,11 @@
|
|||
CustomGamePlayedWhileIdle = "Out from the fields";
|
||||
};
|
||||
};
|
||||
|
||||
bots.zak = {
|
||||
enabled = true;
|
||||
passwordFile = /var/lib/archisteamfarm/bots/zak.password;
|
||||
username = "matheuszak";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue