diff --git a/flake.nix b/flake.nix index d07d7d9..d742089 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; spicetify-nix.url = "github:the-argus/spicetify-nix"; - webcord.url = "github:fufexan/webcord-flake"; }; - outputs = {self, nixpkgs, home-manager, spicetify-nix, webcord, ... }@inputs: + outputs = {self, nixpkgs, home-manager, spicetify-nix, ... }@inputs: let username = "gerg"; system = "x86_64-linux"; @@ -26,11 +25,14 @@ }; overlays = [ (final: prev: rec { - t-rex-miner = final.callPackage ./pkgs/t-rex-miner {}; - afk-cmds = final.callPackage ./pkgs/afk-cmds {}; - } - ) - (import ./suckless) + t-rex-miner = final.callPackage ./pkgs/t-rex-miner {}; + afk-cmds = final.callPackage ./pkgs/afk-cmds {}; + discord = prev.discord.override { + withOpenASAR = true; + nss = prev.nss_latest; + }; + }) + (import ./suckless) ]; }; lib = nixpkgs.lib; diff --git a/home-manager/config/discord/settings.json b/home-manager/config/discord/settings.json new file mode 100644 index 0000000..ee0c42b --- /dev/null +++ b/home-manager/config/discord/settings.json @@ -0,0 +1,15 @@ +{ + "debugLogging": false, + "IS_MAXIMIZED": false, + "IS_MINIMIZED": false, + "MIN_WIDTH": 0, + "MIN_HEIGHT": 0, + "OPEN_ON_STARTUP": false, + "MINIMIZE_TO_TRAY": false, + "openasar": { + "setup": true, + "noTyping": true, + "quickstart": true, + "css": "@import url(\"https://nyri5.github.io/Discolored/main.css\");\n@import url(\"https://luckfire.github.io/amoled-cord/src/support/compiled.css\");\n" + } +} diff --git a/home-manager/sxhkd.nix b/home-manager/sxhkd.nix index b055c74..507d0be 100644 --- a/home-manager/sxhkd.nix +++ b/home-manager/sxhkd.nix @@ -15,7 +15,9 @@ "XF86MonBrightnessDown" = "brightnessctl s 20-"; #screenshot stuff "Print" = "maim $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg"; + "Print + shift" = "maim | xclip -selection clipboard -t image/png"; "super + Print" = "maim -s $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg"; + "super + Print + shift" = "maim -s | xclip -selection clipboard -t image/png"; }; }; } diff --git a/home-manager/config/WebCord/Themes/AMOLED b/misc/amoled.theme.css similarity index 99% rename from home-manager/config/WebCord/Themes/AMOLED rename to misc/amoled.theme.css index af0952a..d1bf9aa 100644 --- a/home-manager/config/WebCord/Themes/AMOLED +++ b/misc/amoled.theme.css @@ -1,2 +1,3 @@ @import url("https://nyri4.github.io/Discolored/main.css"); @import url("https://luckfire.github.io/amoled-cord/src/support/compiled.css"); + diff --git a/modules/packages.nix b/modules/packages.nix index d06c85c..663721c 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,4 +1,4 @@ -{ config, pkgs, callPackage, webcord, ... }: +{ config, pkgs, callPackage, ... }: { environment.systemPackages = with pkgs; [ bottom #view tasks @@ -11,7 +11,7 @@ bitwarden #store stuff gimp #edit stuff qbittorrent #steal stuff - webcord.packages.${pkgs.system}.default # talk to people (gross) + discord # talk to people (gross) spotify-tray # tray icons are nice feh #for wallpaper xfce.mousepad diff --git a/suckless/dwm-patches/15-quit-prompt.diff b/suckless/dwm-patches/15-quit-prompt.diff index b12db6b..9991601 100644 --- a/suckless/dwm-patches/15-quit-prompt.diff +++ b/suckless/dwm-patches/15-quit-prompt.diff @@ -38,7 +38,7 @@ index c77ed1b..7b4689a 100644 +void +quitprompt(const Arg *arg) +{ -+ FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r"); ++ FILE *pp = popen("echo \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r"); + if(pp != NULL) { + char buf[1024]; + if (fgets(buf, sizeof(buf), pp) == NULL) { diff --git a/suckless/dwm/dwm.c b/suckless/dwm/dwm.c index 31aaa9d..97e4f3a 100644 --- a/suckless/dwm/dwm.c +++ b/suckless/dwm/dwm.c @@ -1258,7 +1258,7 @@ quit(const Arg *arg) void quitprompt(const Arg *arg) { - FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r"); + FILE *pp = popen("echo \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r"); if(pp != NULL) { char buf[1024]; if (fgets(buf, sizeof(buf), pp) == NULL) { diff --git a/systems/desktop.nix b/systems/desktop.nix index 84061ea..b98b811 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -19,7 +19,7 @@ hardware.cpu.amd.updateMicrocode = true; #end important stuff environment.systemPackages = with pkgs; [ - afk-cmds + #afk-cmds xmrig t-rex-miner vscodium