commit bd98ce64c86db047d71623e191d9dfb8a0aa8080 · pyrox.dev/nix

-1

modules/home/profiles/gui/default.nix

···

       44
        
             ueberzug

     

       45
        
             lutris

     

       46
        
             py.olympus

     

       47
       -
             py.git-credential-rbw

     

       48
        
             prismlauncher

     

       49
        
             protontricks

     

       50
        
             proton-caller

···

       44
        
             ueberzug

     

       45
        
             lutris

     

       46
        
             py.olympus

     

       0
        
       
     

       47
        
             prismlauncher

     

       48
        
             protontricks

     

       49
        
             proton-caller

+1 -1

modules/home/programs/git/default.nix

···

       93
        
               settings = {

     

       94
        
                 editor = lib.getExe pkgs.py.nvim;

     

       95
        
                 git_protocol = "https";

     

       96
       -
                 browser = lib.mkIf config.py.sway.enable pkgs.firefox-wayland;

     

       97
        
                 prompt = "enabled";

     

       98
        
               };

     

       99
        
             };

···

       93
        
               settings = {

     

       94
        
                 editor = lib.getExe pkgs.py.nvim;

     

       95
        
                 git_protocol = "https";

     

       96
       +
                 browser = lib.mkIf config.py.gui.enable pkgs.firefox;

     

       97
        
                 prompt = "enabled";

     

       98
        
               };

     

       99
        
             };

+1 -1

modules/home/programs/ssh/default.nix

···

       40
        
               "Match" = ''host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"'';

     

       41
        
             };

     

       42
        
           };

     

       43
       -
           home.file.".ssh/authorized_signatures".text = lib.mkIf cfg.enable import ./ssh-auth-signers.nix;

     

       44
        
         };

     

       45
        
       }

···

       40
        
               "Match" = ''host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"'';

     

       41
        
             };

     

       42
        
           };

     

       43
       +
           home.file.".ssh/authorized_signatures".text = import ./ssh-auth-signers.nix;

     

       44
        
         };

     

       45
        
       }

+1 -1

modules/home/programs/starship/default.nix

···

       10
        
           enableFishIntegration = true;

     

       11
        
           enableBashIntegration = true;

     

       12
        
           enableZshIntegration = true;

     

       13
       -
           settings = import ./settings.nix lib;

     

       14
        
         };

     

       15
        
       }

···

       10
        
           enableFishIntegration = true;

     

       11
        
           enableBashIntegration = true;

     

       12
        
           enableZshIntegration = true;

     

       13
       +
           settings = import ./settings.nix { inherit lib; };

     

       14
        
         };

     

       15
        
       }

-46

packages/git-credential-rbw/default.nix

···

       1
       -
       { pkgs, ... }:

     

       2
       -
       pkgs.writeShellApplication {

     

       3
       -
         name = "git-credential-rbw";

     

       4
       -
         runtimeInputs = [ pkgs.rbw ];

     

       5
       -
         checkPhase = "true";

     

       6
       -
         text = ''

     

       7
       -
           #${pkgs.bash}/bin/bash

     

       8
       -
       

     

       9
       -
           declare -A params

     

       10
       -
       

     

       11
       -
           if [ "x$1" == "xget" ]; then

     

       12
       -
               read line

     

       13
       -
               while [ -n "$line" ]; do

     

       14
       -
                   key=''${line%%=*}

     

       15
       -
                   value=''${line#*=}

     

       16
       -
                   params[$key]=$value

     

       17
       -
                   read line

     

       18
       -
               done

     

       19
       -
       

     

       20
       -
               if [ "''${params['protocol']}" != "xhttps" ]; then

     

       21
       -
                   exit

     

       22
       -
               fi

     

       23
       -
       

     

       24
       -
               if [ -z "''${params["host"]}" ]; then

     

       25
       -
                   exit

     

       26
       -
               fi

     

       27
       -
       

     

       28
       -
               rbw ls > /dev/null 2>&1

     

       29
       -
               if [ $? -ne 0 ]; then

     

       30
       -
                   echo "Please login to rbw to use git credential helper" > /dev/stderr

     

       31
       -
                   exit

     

       32
       -
               fi

     

       33
       -
       

     

       34
       -
               user=`rbw get --full ''${params["host"]} | grep "Username:" | cut -d' ' -f2-`

     

       35
       -
               pass=`rbw get ''${params["host"]}`

     

       36
       -
       

     

       37
       -
               if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then

     

       38
       -
                   echo "Couldn't find host in rbw DB." > /dev/stderr

     

       39
       -
                   exit

     

       40
       -
               fi

     

       41
       -
       

     

       42
       -
               echo username=$user

     

       43
       -
               echo password=$pass

     

       44
       -
               fi

     

       45
       -
         '';

     

       46
       -
       }