diff --git a/.config/i3/config b/.config/i3/config index ad1e7f6..9e529fe 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -362,7 +362,7 @@ exec --no-startup-id sleep 5 && nvidia-settings -a "[gpu:0]/GPUGraphicsClockOffs #exec --no-startup-id sleep 2 && xfce4-terminal #exec --no-startup-id sleep 7 && firefox https://github.com/endeavouros-team/endeavouros-i3wm-setup/blob/main/force-knowledge.md #exec --no-startup-id sleep 3 && thunar -exec --no-startup-id i3-msg workspace $ws9; exec discordcanary +exec --no-startup-id i3-msg workspace $ws9; exec discord exec --no-startup-id i3-msg workspace $ws10; exec firefox ############### diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 1de5613..4e8666c 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -286,11 +286,13 @@ in { "${pkgs.hyprshade}/bin/hyprshade auto" "dex --autostart --environment Hyprland" "${pkgs.hypridle}/bin/hypridle &" - "sleep 3 && ${pkgs.waybar}/bin/waybar &" #"${pkgs.dunst}/bin/dunst &" ] ++ lib.lists.optionals (osConfig.networking.hostName == "kop-pc") [ + "[workspace 9 silent] discord" "[workspace 9 silent] discordcanary" "[workspace 10 silent] firefox" + ] ++ [ + "sleep 3 && ${pkgs.waybar}/bin/waybar &" ]; }; extraConfig = let diff --git a/home-manager/nixvim/lsp.nix b/home-manager/nixvim/lsp.nix index 8abc0ff..c5f6c35 100644 --- a/home-manager/nixvim/lsp.nix +++ b/home-manager/nixvim/lsp.nix @@ -9,6 +9,7 @@ enable = true; servers = { bashls.enable = true; + #ccls.enable = true; clangd.enable = true; cssls.enable = true; gopls.enable = true; diff --git a/modules/graphical/basics.nix b/modules/graphical/basics.nix index 5ca4795..0f802d0 100644 --- a/modules/graphical/basics.nix +++ b/modules/graphical/basics.nix @@ -9,7 +9,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ keepassxc - discord-canary + discord gvfs remmina thunderbird diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index 80ead3f..9d84789 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -43,6 +43,7 @@ in { driSupport32Bit = true; }; }; + nvidia_oc = "${pkgs.nvidia_oc}/bin/nvidia_oc"; in lib.mkIf cfg.enable (lib.recursiveUpdate nvidiaOption { boot.kernelParams = [ "nvidia-drm.fbdev=1" "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ]; @@ -109,26 +110,12 @@ in { systemd.services.nvidiaSetClocks = lib.mkIf cfg.clock.enable { description = "Set GPU clocks"; script = - "/run/current-system/sw/bin/nvidia-smi -pm 1 && /run/current-system/sw/bin/nvidia-smi -i 0 -lgc ${ - toString cfg.clock.min - },${toString cfg.clock.max}"; + "${nvidia_oc} set -i 0 --min-clock ${toString cfg.clock.min} --max-clock ${ + toString cfg.clock.max + } --freq-offset ${toString cfg.clock.offset}"; wantedBy = [ "multi-user.target" ]; - after = [ "display-manager.service" ]; - requires = [ "display-manager.service" ]; - environment.DISPLAY = ":0"; - environment.XAUTHORITY = "/home/kopatz/.Xauthority"; + after = [ "network.target" ]; }; - # doesn't work - #systemd.user.services.nvidiaSetOffset = lib.mkIf cfg.clock.enable { - # description = "Sets gpu offset"; - # enable = true; - # serviceConfig = { Type = "oneshot"; }; - # script = '' - # ${config.hardware.nvidia.package.settings}/bin/nvidia-settings -a "[gpu:0]/GPUGraphicsClockOffsetAllPerformanceLevels=${ - # toString cfg.clock.offset - # }"''; - # environment = { DISPLAY = ":0"; }; - # after = [ "graphical-session.target" ]; - #}; + }); } diff --git a/overlays.nix b/overlays.nix index 5621c55..c7a9cbc 100644 --- a/overlays.nix +++ b/overlays.nix @@ -13,6 +13,7 @@ in { # https://nixos.wiki/wiki/Overlays modifications = final: prev: { discord-canary = prev.discord-canary.override { withVencord = true; }; + discord = prev.discord.override { withVencord = true; }; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { # version = "0.45.0";