commit 5bab7a1f4d46e8fbda6d1df02637148b72ce3220 · pyrox.dev/nix

+1 -1

modules/home/profiles/gui/default.nix

···

       23
       23
        
               ghostty.enable = mkDefault true;

     

       24
       24
        
               kitty.enable = mkDefault false;

     

       25
       25
        
               obs.enable = mkDefault true;

     

       26
       26
       +
               onagre.enable = mkDefault true;

     

       26
       27
        
               vscodium.enable = mkDefault false;

     

       27
       28
        
               wlogout.enable = mkDefault true;

     

       28
       29
        
               zed-editor.enable = mkDefault true;

     
···

       48
       49
        
             pwvucontrol

     

       49
       50
        
             satty

     

       50
       51
        
             slurp

     

       51
       51
       -
             sway-launcher-desktop

     

       52
       52
        
             ueberzug

     

       53
       53
        
             (olympus.overrideAttrs (_: {

     

       54
       54
        
               celesteWrapper = osConfig.programs.steam.package.run;

+13

modules/home/programs/onagre/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.py.programs.onagre;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         options.py.programs.onagre.enable = lib.mkEnableOption "onagre";

     

       12
       12
       +
         config.home.packages = lib.mkIf cfg.enable [ pkgs.onagre ];

     

       13
       13
       +
       }

+1

modules/home/programs/zed-editor/default.nix

···

       15
       15
        
             pkgs.zlib

     

       16
       16
        
             pkgs.openssl

     

       17
       17
        
             pkgs.openssh-patched

     

       18
       18
       +
             pkgs.kdePackages.qtdeclarative

     

       18
       19
        
           ]);

     

       19
       20
        
           userSettings = import ./settings.nix;

     

       20
       21
        
           extensions = [

+2 -5

modules/home/wayland/sway.nix

···

       37
       37
        
             };

     

       38
       38
        
             config = {

     

       39
       39
        
               terminal = lib.getExe pkgs.ghostty;

     

       40
       40
       -
               menu = "exec ${term} --class=py.floating --window-height=20 --window-width=12 --font-size=14 -e ${pkgs.sway-launcher-desktop}/bin/sway-launcher-desktop";

     

       40
       40
       +
               menu = "exec ${lib.getExe pkgs.onagre}";

     

       41
       41
        
               modifier = "Mod4";

     

       42
       42
        
               bars = [ { command = "true"; } ];

     

       43
       43
        
               focus = {

     
···

       46
       46
        
                 newWindow = "smart";

     

       47
       47
        
               };

     

       48
       48
        
               fonts = {

     

       49
       49
       -
                 names = [ "IBM Plex Sans" ];

     

       49
       49
       +
                 names = [ "Inter" ];

     

       50
       50
        
                 style = "Regular";

     

       51
       51
        
                 size = 12.0;

     

       52
       52
        
               };

     
···

       86
       86
        
               output = {

     

       87
       87
        
                 eDP-1 = {

     

       88
       88
        
                   scale = "1.2";

     

       89
       89
       -
                 };

     

       90
       90
       -
                 "*" = {

     

       91
       91
       -
                   bg = "${homeDir}/bgs/xenia-hangout-mocha.png fill";

     

       92
       89
        
                 };

     

       93
       90
        
               };

     

       94
       91
        
               startup = [

-45

packages/olympus/default.nix

···

       1
       1
       -
       { pkgs }:

     

       2
       2
       -
       let

     

       3
       3
       -
         olympus = pkgs.stdenv.mkDerivation rec {

     

       4
       4
       -
           pname = "olympus";

     

       5
       5
       -
           version = "4238";

     

       6
       6
       -
       

     

       7
       7
       -
           # https://everestapi.github.io/

     

       8
       8
       -
           src = pkgs.fetchzip {

     

       9
       9
       -
             url = "https://dev.azure.com/EverestAPI/Olympus/_apis/build/builds/${version}/artifacts?artifactName=linux.main&$format=zip#linux.main.zip";

     

       10
       10
       -
             hash = "sha256-KWDr4KsF23iDWA9h/r+cnpDIKKwCVVOfuh6sjvXSnII=";

     

       11
       11
       -
           };

     

       12
       12
       -
       

     

       13
       13
       -
           buildInputs = [ pkgs.unzip ];

     

       14
       14
       -
           installPhase = ''

     

       15
       15
       -
             mkdir -p "$out/opt/olympus/"

     

       16
       16
       -
             mv dist.zip "$out/opt/olympus/" && cd "$out/opt/olympus/"

     

       17
       17
       -
       

     

       18
       18
       -
             unzip dist.zip && rm dist.zip

     

       19
       19
       -
             mkdir $out && echo XDG_DATA_HOME=$out

     

       20
       20
       -
       

     

       21
       21
       -
             echo y | XDG_DATA_HOME="$out/share/" bash install.sh

     

       22
       22
       -
             sed -i "/ldconfig/d" ./love

     

       23
       23
       -
             sed -i "s/Exec=.*/Exec=olympus %u/g" ../../share/applications/Olympus.desktop

     

       24
       24
       -
           '';

     

       25
       25
       -
         };

     

       26
       26
       -
       in

     

       27
       27
       -
       pkgs.buildFHSEnv {

     

       28
       28
       -
         name = "olympus";

     

       29
       29
       -
         runScript = "${olympus}/opt/olympus/olympus";

     

       30
       30
       -
         targetPkgs = pkgs: [

     

       31
       31
       -
           pkgs.freetype

     

       32
       32
       -
           pkgs.zlib

     

       33
       33
       -
           pkgs.SDL2

     

       34
       34
       -
           pkgs.curl

     

       35
       35
       -
           pkgs.libpulseaudio

     

       36
       36
       -
           pkgs.gtk3

     

       37
       37
       -
           pkgs.glib

     

       38
       38
       -
           pkgs.libGL

     

       39
       39
       -
           pkgs.libdrm

     

       40
       40
       -
         ];

     

       41
       41
       -
       

     

       42
       42
       -
         # https://github.com/EverestAPI/Olympus/blob/main/lib-linux/olympus.desktop

     

       43
       43
       -
         # https://stackoverflow.com/questions/8822097/how-to-replace-a-whole-line-with-sed

     

       44
       44
       -
         extraInstallCommands = ''cp -r "${olympus}/share/" $out'';

     

       45
       45
       -
       }

-38

packages/rsrpc/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         fetchFromGitHub,

     

       4
       4
       -
         rustPlatform,

     

       5
       5
       -
         openssl,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       rustPlatform.buildRustPackage (finalAttrs: {

     

       10
       10
       -
         pname = "rsrpc";

     

       11
       11
       -
         version = "0.24.2";

     

       12
       12
       -
       

     

       13
       13
       -
         src = fetchFromGitHub {

     

       14
       14
       -
           owner = "SpikeHD";

     

       15
       15
       -
           repo = "rsRPC";

     

       16
       16
       -
           tag = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-Epf84YY7wkQjBbM09NbCSLiVreIgc/OA2g8tN8OmwXQ=";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         cargoHash = "sha256-fTDAs88GE+ZoaCSJwCAUolTHpigDbkqNVMlbZOO5v1o=";

     

       21
       21
       -
       

     

       22
       22
       -
         nativeBuildInputs = [

     

       23
       23
       -
           pkg-config

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       26
       -
         buildInputs = [

     

       27
       27
       -
           openssl

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         meta = {

     

       31
       31
       -
           changelog = "https://github.com/SpikeHD/rsRPC/releases/tag/v${finalAttrs.version}";

     

       32
       32
       -
           description = "Rust implementation of the Discord RPC server";

     

       33
       33
       -
           homepage = "https://github.com/SpikeHD/rsRPC";

     

       34
       34
       -
           license = lib.licenses.mit;

     

       35
       35
       -
           maintainers = [ lib.maintainers.pyrox0 ];

     

       36
       36
       -
           mainProgram = "rsrpc-cli";

     

       37
       37
       -
         };

     

       38
       38
       -
       })